[pocl] 05/09: add support for glibc 2.23

Andreas Beckmann anbe at moszumanska.debian.org
Thu Jun 16 10:04:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch experimental
in repository pocl.

commit 4ea27c039e71768d6bde39f56b00e8082e19b113
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Jun 15 18:01:42 2016 +0200

    add support for glibc 2.23
---
 debian/changelog                |  1 +
 debian/patches/glibc-2.23.patch | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 85332c3..52859ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pocl (0.13-1) UNRELEASED; urgency=medium
   * New upstream release.  (Closes: #820480)
   * Refresh llvm-system-libs.patch, new upstream only supports llvm 3.7/3.8.
   * Remove fix-image-args.patch, fixed upstream.
+  * glibc-2.23.patch: New, add support for glibc 2.23.
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 15 Jun 2016 17:38:32 +0200
 
diff --git a/debian/patches/glibc-2.23.patch b/debian/patches/glibc-2.23.patch
new file mode 100644
index 0000000..11c5b92
--- /dev/null
+++ b/debian/patches/glibc-2.23.patch
@@ -0,0 +1,22 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: compatibility with glibc-2.23
+ inspired by the Ubuntu patch in 0.13-0ubuntu1
+
+--- a/lib/kernel/vecmathlib/floattypes.h
++++ b/lib/kernel/vecmathlib/floattypes.h
+@@ -39,6 +39,7 @@ using namespace std;
+       __attribute__((__unused__))
+ #endif
+ 
++#if !defined(__GLIBC__) || (__GLIBC__ == 6 && __GLIBC_MINOR__ < 23)
+ // Capture libc macros, then undefine them
+ #ifndef isfinite
+ #error "isfinite is not a macro"
+@@ -55,6 +56,7 @@ using namespace std;
+ #ifndef signbit
+ #error "signbit is not a macro"
+ #endif
++#endif
+ 
+ namespace {
+ template <typename T> inline int libc_isfinite(T x) { return isfinite(x); }
diff --git a/debian/patches/series b/debian/patches/series
index c35ac95..f737c5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ llvm-system-libs.patch
 typos.patch
 fix-tests-i386.patch
 find-sys-cdefs-h.patch
+glibc-2.23.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git



More information about the Pkg-opencl-commits mailing list