[jffi] 01/04: disable MODEL in makefiles

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jffi.

commit a470d4af2269fc203ffd11d6fd4d30e63ba94891
Author: tony mancill <tmancill at debian.org>
Date:   Thu Jun 18 22:25:03 2015 -0700

    disable MODEL in makefiles
---
 debian/patches/disable-MODEL-in-makefiles.patch | 30 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/disable-MODEL-in-makefiles.patch b/debian/patches/disable-MODEL-in-makefiles.patch
new file mode 100644
index 0000000..5cc456b
--- /dev/null
+++ b/debian/patches/disable-MODEL-in-makefiles.patch
@@ -0,0 +1,30 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index 27737be..fc0ef01 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -251,8 +251,8 @@ endif
+ ifneq ($(strip $(findstring $(OS), solaris linux)),)
+   # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags
+   # makes the libffi build choke
+-  CC += -m$(MODEL)
+-  LD += -m$(MODEL)
++  #CC += -m$(MODEL)
++  #LD += -m$(MODEL)
+ endif
+ 
+ LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
+diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile
+index 9e70664..07c3950 100644
+--- a/libtest/GNUmakefile
++++ b/libtest/GNUmakefile
+@@ -177,8 +177,8 @@ endif
+ ifneq ($(strip $(findstring $(OS), solaris)),)
+   # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags
+   # makes the libffi build choke
+-  CC += -m$(MODEL)
+-  LD += -m$(MODEL)
++  #CC += -m$(MODEL)
++  #LD += -m$(MODEL)
+ endif
+ 
+ LIBTEST = $(BUILD_DIR)/$(LIBNAME)
diff --git a/debian/patches/series b/debian/patches/series
index 7d4d48c..f07df96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable-MODEL-in-makefiles.patch
 disable-warnings-as-errors-for-jni.patch
 junit_path_for_tests.patch
 disable-warnings-as-errors-for-libtest.patch

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