[med-svn] [Git][med-team/castxml][master] 3 commits: d/control: Use llvm-9-dev and libclang-9-dev

Gert Wollny gitlab at salsa.debian.org
Thu Nov 14 07:45:02 GMT 2019



Gert Wollny pushed to branch master at Debian Med / castxml


Commits:
4be8e58e by Gert Wollny at 2019-11-14T07:14:06Z
d/control: Use llvm-9-dev and libclang-9-dev

This is needed, because with g++-9 sime intrinsics were added that
are not supported with older versions

- - - - -
5e2226fa by Gert Wollny at 2019-11-14T07:14:50Z
d/p/0003: Add patch to fix expected output with llvm-9

- - - - -
b14a66fc by Gert Wollny at 2019-11-14T07:15:33Z
d/changelog: update for upload

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0004-correct-expected-for-clang9.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+castxml (0.2.0-4) unstable; urgency=medium
+
+  [ Gert Wollny ]
+  * d/control: Use llvm-9-dev and also use libclang-9-dev to 
+    fix problems with g++-9 
+  * d/p/0003: Add patch to fix expected output with llvm-9
+
+ -- Gert Wollny <gewo at debian.org>  Thu, 14 Nov 2019 07:59:52 +0100
+
 castxml (0.2.0-3) unstable; urgency=medium
 
   [ Steven Robbins ]


=====================================
debian/control
=====================================
@@ -6,8 +6,8 @@ Priority: optional
 Build-Depends: debhelper (>= 10),
                cmake,
                help2man,
-               libclang-dev,
-               llvm-dev,
+               libclang-9-dev,
+               llvm-9-dev,
                libedit-dev,
                zlib1g-dev
 Standards-Version: 4.1.5


=====================================
debian/patches/0004-correct-expected-for-clang9.patch
=====================================
@@ -0,0 +1,32 @@
+commit d78e08ee50b25e851d1dd2143d4d132baf6c4f3e
+Author: Brad King <brad.king at kitware.com>
+Date:   Wed Aug 28 15:37:36 2019 -0400
+
+    test: Update expected XML output for LLVM/Clang 9.0
+    
+    The format of a lambda initializer changed slightly.  Update our regex.
+
+diff --git a/test/expect/castxml1.any.Variable-lambda.xml.txt b/test/expect/castxml1.any.Variable-lambda.xml.txt
+index 54edf13..f0f3eb1 100644
+--- a/test/expect/castxml1.any.Variable-lambda.xml.txt
++++ b/test/expect/castxml1.any.Variable-lambda.xml.txt
+@@ -1,6 +1,6 @@
+ ^<\?xml version="1.0"\?>
+ <CastXML[^>]*>
+-  <Variable id="_1" name="start" type="_2" init="\[\] \(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/>
++  <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/>
+   <Class id="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/>
+   <Namespace id="_3" name="::"/>
+   <File id="f1" name=".*/test/input/Variable-lambda.cxx"/>
+diff --git a/test/expect/gccxml.any.Variable-lambda.xml.txt b/test/expect/gccxml.any.Variable-lambda.xml.txt
+index 81d6600..ed1bb8f 100644
+--- a/test/expect/gccxml.any.Variable-lambda.xml.txt
++++ b/test/expect/gccxml.any.Variable-lambda.xml.txt
+@@ -1,6 +1,6 @@
+ ^<\?xml version="1.0"\?>
+ <GCC_XML[^>]*>
+-  <Variable id="_1" name="start" type="_2" init="\[\] \(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/>
++  <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/>
+   <Class id="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/>
+   <Namespace id="_3" name="::"/>
+   <File id="f1" name=".*/test/input/Variable-lambda.cxx"/>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 0001-fix-version-test-to-allow-text-before-clang.patch
 0002-dont-install-license-file.patch
 0003-Link-against-libatomic.patch
+0004-correct-expected-for-clang9.patch



View it on GitLab: https://salsa.debian.org/med-team/castxml/compare/f5cdf45cf67b488d8bb4de46dfe3d6273747d3ce...b14a66fc0d370fe9aad9b42330e27749e9a7cc93

-- 
View it on GitLab: https://salsa.debian.org/med-team/castxml/compare/f5cdf45cf67b488d8bb4de46dfe3d6273747d3ce...b14a66fc0d370fe9aad9b42330e27749e9a7cc93
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191114/3349cfea/attachment-0001.html>


More information about the debian-med-commit mailing list