[gluegen2] 01/01: glibc-compat-symbols.h: don't check for specific glibc symbol version

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository gluegen2.

commit 1a29ed5a14cf128bf1fe327ad8f2655182a76e35
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Oct 11 23:47:41 2015 +0200

    glibc-compat-symbols.h: don't check for specific glibc symbol version
---
 debian/changelog                        |  6 ++++
 debian/patches/missing-arch-symbol.diff | 59 ++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 643b979..7ae898b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 gluegen2 (2.3.1-3) UNRELEASED; urgency=medium
 
+  [ tony mancill ]
   * Team upload.
   * Make the build-dep on default-jdk versioned on >= 2:1.6.
     This prevents attempts to build on non-openjdk architectures.
 
+  [ Gilles Filippini ]
+  * Patch missing-arch-symbol.diff: don't check at all for specific
+    glibc symbol version in glibc-compat-symbols.h (fix FTBFS on
+    armel and armel64).
+
  -- tony mancill <tmancill at debian.org>  Sun, 11 Oct 2015 12:21:41 -0700
 
 gluegen2 (2.3.1-2) experimental; urgency=medium
diff --git a/debian/patches/missing-arch-symbol.diff b/debian/patches/missing-arch-symbol.diff
index 2f4af36..4e86c0f 100644
--- a/debian/patches/missing-arch-symbol.diff
+++ b/debian/patches/missing-arch-symbol.diff
@@ -1,22 +1,41 @@
---- a/make/stub_includes/platform/glibc-compat-symbols.h
-+++ b/make/stub_includes/platform/glibc-compat-symbols.h
-@@ -24,7 +24,8 @@
-         #elif defined(__amd64__)
-            #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
-         #else
+Index: gluegen2/make/stub_includes/platform/glibc-compat-symbols.h
+===================================================================
+--- gluegen2.orig/make/stub_includes/platform/glibc-compat-symbols.h
++++ gluegen2/make/stub_includes/platform/glibc-compat-symbols.h
+@@ -15,35 +15,7 @@
+  *
+  * Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
+  */
+-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
+-    #if defined(__GNUC__)
+-        #if defined(__aarch64__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
+-        #elif defined(__arm__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
+-        #elif defined(__amd64__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
+-        #else
 -           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
-+           /* Don't try to guess a wrong version */
-+           #define GLIBC_COMPAT_SYMBOL(FFF)
-         #endif /*__amd64__*/
-     #elif defined(__clang__)
-         #if defined(__aarch64__)
-@@ -34,7 +35,8 @@
-         #elif defined(__amd64__)
-            #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
-         #else
+-        #endif /*__amd64__*/
+-    #elif defined(__clang__)
+-        #if defined(__aarch64__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
+-        #elif defined(__arm__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
+-        #elif defined(__amd64__)
+-           #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
+-        #else
 -           #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0");
-+           /* Don't try to guess a wrong version */
-+           #define GLIBC_COMPAT_SYMBOL(FFF)
-         #endif /*__amd64__*/
-     #else
-         #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
+-        #endif /*__amd64__*/
+-    #else
+-        #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
+-        #define GLIBC_COMPAT_SYMBOL(FFF)
+-    #endif
+-#else
+-    #warning GLIBC_COMPAT_SYMBOL not supported with target OS
+-    #define GLIBC_COMPAT_SYMBOL(FFF)
+-#endif
++#define GLIBC_COMPAT_SYMBOL(FFF)
+ 
+ GLIBC_COMPAT_SYMBOL(memcpy)
+  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git