[gluegen2] 01/02: Fix missing-arch-symbol.diff to cover the gcc case as well as clang

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository gluegen2.

commit 4247c7a979b65f2950f56d1edb21e2391200a6a3
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Fri Nov 14 22:53:35 2014 +0100

    Fix missing-arch-symbol.diff to cover the gcc case as well as clang
    
    Closes: #769003
---
 debian/patches/missing-arch-symbol.diff | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/patches/missing-arch-symbol.diff b/debian/patches/missing-arch-symbol.diff
index 2c22ea0..0aff238 100644
--- a/debian/patches/missing-arch-symbol.diff
+++ b/debian/patches/missing-arch-symbol.diff
@@ -1,8 +1,16 @@
-Index: gluegen-v2.2.0/make/stub_includes/platform/glibc-compat-symbols.h
-===================================================================
---- gluegen-v2.2.0.orig/make/stub_includes/platform/glibc-compat-symbols.h	2014-08-10 15:38:43.065816752 +0200
-+++ gluegen-v2.2.0/make/stub_includes/platform/glibc-compat-symbols.h	2014-08-10 15:38:43.065816752 +0200
-@@ -30,7 +30,8 @@
+--- a/make/stub_includes/platform/glibc-compat-symbols.h
++++ b/make/stub_includes/platform/glibc-compat-symbols.h
+@@ -22,7 +22,8 @@
+         #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(__arm__)
+@@ -30,7 +31,8 @@
          #elif defined(__amd64__)
             #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
          #else

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