[SCM] Java Foreign Function Interface branch, master, updated. debian/1.0.2-8-1-g59053dc

[tony mancill]

The following commit has been merged in the master branch:
commit 59053dc1da2643f3e9f071957f6e93365e9cbf3d
Author: Matthias Klose <doko at debian.org>
Date:   Fri May 4 08:53:38 2012 +0200

    Imported Debian patch 1.0.2-8.1

diff --git a/debian/changelog b/debian/changelog
index 503697f..a93ecad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jffi (1.0.2-8.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #667215.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 04 May 2012 08:53:38 +0200
+
 jffi (1.0.2-8) unstable; urgency=low
 
   * Add version restriction to Depends: libjffi-jni.
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..ad95584
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,26 @@
+Index: jffi-1.0.2/jni/GNUmakefile
+===================================================================
+--- jffi-1.0.2.orig/jni/GNUmakefile	2012-05-29 07:10:47.000000000 +0000
++++ jffi-1.0.2/jni/GNUmakefile	2012-05-29 07:11:34.000000000 +0000
+@@ -156,7 +156,7 @@
+ endif
+ 
+ ifeq ($(OS), linux)
+-  SOFLAGS = -shared -mimpure-text -static-libgcc -Wl,-soname,$(@F) -Wl,-O1
++  SOFLAGS = -shared -static-libgcc -Wl,-soname,$(@F) -Wl,-O1
+   CFLAGS += -pthread
+ endif
+ 
+Index: jffi-1.0.2/libtest/GNUmakefile
+===================================================================
+--- jffi-1.0.2.orig/libtest/GNUmakefile	2012-05-29 07:10:47.000000000 +0000
++++ jffi-1.0.2/libtest/GNUmakefile	2012-05-29 07:14:19.110281617 +0000
+@@ -47,7 +47,7 @@
+ OFLAGS = -O2 $(JFLAGS)
+ WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -mimpure-text -Wl,-O1
++SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
+ 
+ IFLAGS = -I"$(BUILD_DIR)"
diff --git a/debian/patches/series b/debian/patches/series
index 02da13f..671c1a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-ignore-test-failures.patch
 0003-do-not-add-m32-or-m64-to-CC-and-LD.patch
 0004-load-jffi-native.jar-from-system-directory.patch
+ftbfs-gcc-4.7.diff

-- 
Java Foreign Function Interface