[med-svn] [Git][med-team/castxml][master] 2 commits: d/p: housecleaning
Gert Wollny
gitlab at salsa.debian.org
Sun Jul 1 16:59:09 BST 2018
Gert Wollny pushed to branch master at Debian Med / castxml
Commits:
7bb62161 by Gert Wollny at 2018-07-01T17:57:17+02:00
d/p: housecleaning
- - - - -
10c85253 by Gert Wollny at 2018-07-01T17:58:53+02:00
update changelog
- - - - -
3 changed files:
- debian/changelog
- debian/patches/0002-dont-install-license-file.patch
- − debian/patches/5cfebb0f904131d1df8e36fcb9c290.patch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ castxml (0.1+git20180702-1) UNRELEASED; urgency=medium
* d/copyright: Update url to use https
* d/p/0002: Add description
* d/p/0003: Fix linking issue with llvm >= 6.0
+ * Add CI file
+ * d/p: housecleaning
- -- Gert Wollny <gewo at debian.org> Sun, 01 Jul 2018 17:33:11 +0200
+ -- Gert Wollny <gewo at debian.org> Sun, 01 Jul 2018 17:58:30 +0200
castxml (0.1+git20170823-2) unstable; urgency=medium
=====================================
debian/patches/0002-dont-install-license-file.patch
=====================================
--- a/debian/patches/0002-dont-install-license-file.patch
+++ b/debian/patches/0002-dont-install-license-file.patch
@@ -1,4 +1,4 @@
-Description: dont install license file
+Description: don't install license file
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,6 @@
=====================================
debian/patches/5cfebb0f904131d1df8e36fcb9c290.patch deleted
=====================================
--- a/debian/patches/5cfebb0f904131d1df8e36fcb9c290.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 5cfebb0f904131d1df8e36fcb9c290f12c06e9ba Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king at kitware.com>
-Date: Tue, 9 Feb 2016 11:24:47 -0500
-Subject: [PATCH] RunClang: Avoid GNU extensions in glibc math headers on i386
-
-On i386 with optimizations enabled, the `bits/mathinline.h` header may
-use a GNU extension not implemented by Clang. Avoid parsing this code
-by defining `__NO_MATH_INLINES` so it will be preprocessed out.
-
-GitHub-Issue: #47
----
- src/RunClang.cxx | 14 ++++++++++++++
- test/CMakeLists.txt | 2 ++
- test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt | 11 +++++++++++
- test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt | 12 ++++++++++++
- 4 files changed, 39 insertions(+)
- create mode 100644 test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt
- create mode 100644 test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt
-
-diff --git a/src/RunClang.cxx b/src/RunClang.cxx
-index 9768a25..0a68698 100644
---- a/src/RunClang.cxx
-+++ b/src/RunClang.cxx
-@@ -204,6 +204,13 @@ class CastXMLPredefines: public T
- }
- }
-
-+ // Prevent glibc use of a GNU extension not implemented by Clang.
-+ if (this->NeedNoMathInlines(this->Opts.Predefines)) {
-+ builtins += "\n"
-+ "#define __NO_MATH_INLINES 1\n"
-+ ;
-+ }
-+
- } else {
- builtins += predefines.substr(start, end-start);
- }
-@@ -229,6 +236,13 @@ class CastXMLPredefines: public T
- pd.find("#define __ia64__ ") != pd.npos));
- }
-
-+ bool NeedNoMathInlines(std::string const& pd) const {
-+ return (this->IsActualGNU(pd) &&
-+ (pd.find("#define __i386__ ") != pd.npos &&
-+ pd.find("#define __OPTIMIZE__ ") != pd.npos &&
-+ pd.find("#define __NO_MATH_INLINES ") == pd.npos));
-+ }
-+
- bool BeginSourceFileAction(clang::CompilerInstance& CI,
- llvm::StringRef /*Filename*/) {
- CI.getPreprocessor().setPredefines(this->UpdatePredefines(CI));
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index e13d308..9ed4a50 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -205,6 +205,7 @@ castxml_test_cmd(cc-gnu-src-cxx-cmd --castxml-cc-gnu $<TARGET_FILE:cc-gnu> ${emp
- castxml_test_cmd(cc-gnu-tgt-amd64 --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__amd64__ ")" ${empty_cxx} "-###")
- castxml_test_cmd(cc-gnu-tgt-explicit --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> ")" -target explicit-target-triple ${empty_cxx} "-###")
- castxml_test_cmd(cc-gnu-tgt-i386 --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__i386__ ")" ${empty_cxx} "-###")
-+castxml_test_cmd(cc-gnu-tgt-i386-opt-E --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__i386__ --cc-define=__OPTIMIZE__ ")" ${empty_cxx} -E -dM)
- castxml_test_cmd(cc-gnu-tgt-mingw --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=_WIN32 --cc-define=__MINGW32__ ")" ${empty_cxx} "-###")
- castxml_test_cmd(cc-gnu-tgt-win --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=_WIN32 ")" ${empty_cxx} "-###")
- castxml_test_cmd(cc-gnu-tgt-x86_64 --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__x86_64__ ")" ${empty_cxx} "-###")
-@@ -224,6 +225,7 @@ castxml_test_cmd(cc-gnu-c-std-c11 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> -
- castxml_test_cmd(cc-gnu-c-std-gnu89 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> ")" ${empty_c} "-###")
- castxml_test_cmd(cc-gnu-c-std-gnu99 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> -std=199901L ")" ${empty_c} "-###")
- castxml_test_cmd(cc-gnu-c-std-gnu11 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> -std=201112L ")" ${empty_c} "-###")
-+castxml_test_cmd(cc-gnu-c-tgt-i386-opt-E --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> --cc-define=__i386__ --cc-define=__OPTIMIZE__ ")" ${empty_c} -E -dM)
-
- # Test --castxml-cc-msvc detection.
- add_executable(cc-msvc cc-msvc.c)
-diff --git a/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt b/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt
-new file mode 100644
-index 0000000..865095d
---- /dev/null
-+++ b/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt
-@@ -0,0 +1,11 @@
-+^#define __GNUC_MINOR__ 1
-+#define __GNUC__ 1
-+#define __NO_MATH_INLINES 1
-+#define __OPTIMIZE__ 1
-+#define __builtin_va_arg_pack\(\) 0
-+#define __builtin_va_arg_pack_len\(\) 1
-+#define __castxml__ [0-9]+
-+#define __castxml_clang_major__ [0-9]+
-+#define __castxml_clang_minor__ [0-9]+
-+#define __castxml_clang_patchlevel__ [0-9]+
-+#define __i386__ 1$
-diff --git a/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt b/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt
-new file mode 100644
-index 0000000..fa9c1e5
---- /dev/null
-+++ b/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt
-@@ -0,0 +1,12 @@
-+^#define __GNUC_MINOR__ 1
-+#define __GNUC__ 1
-+#define __NO_MATH_INLINES 1
-+#define __OPTIMIZE__ 1
-+#define __builtin_va_arg_pack\(\) 0
-+#define __builtin_va_arg_pack_len\(\) 1
-+#define __castxml__ [0-9]+
-+#define __castxml_clang_major__ [0-9]+
-+#define __castxml_clang_minor__ [0-9]+
-+#define __castxml_clang_patchlevel__ [0-9]+
-+#define __cplusplus 199711L
-+#define __i386__ 1$
View it on GitLab: https://salsa.debian.org/med-team/castxml/compare/a3b669c51e375f97768fec382cce4234777e499d...10c85253de7b767fdb7b3cc7dcc954ddfd0969c6
--
View it on GitLab: https://salsa.debian.org/med-team/castxml/compare/a3b669c51e375f97768fec382cce4234777e499d...10c85253de7b767fdb7b3cc7dcc954ddfd0969c6
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/20180701/711c9a2d/attachment-0001.html>
More information about the debian-med-commit
mailing list