[jaffl] 02/03: add patch for #712882 - ftbfs on mips during post-compile-test
Tony Mancill
tmancill at moszumanska.debian.org
Sat Nov 30 06:26:44 UTC 2013
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository jaffl.
commit c94bec622b89996ece7fd46036e9626032d63426
Author: tony mancill <tmancill at debian.org>
Date: Fri Nov 29 17:26:25 2013 -0800
add patch for #712882 - ftbfs on mips during post-compile-test
---
debian/patches/0004-mips-support.diff | 20 ++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 21 insertions(+)
diff --git a/debian/patches/0004-mips-support.diff b/debian/patches/0004-mips-support.diff
new file mode 100644
index 0000000..9679900
--- /dev/null
+++ b/debian/patches/0004-mips-support.diff
@@ -0,0 +1,20 @@
+diff -uNr jaffl-0.5.9.orig/libtest/GNUmakefile jaffl-0.5.9/libtest/GNUmakefile
+--- jaffl-0.5.9.orig/libtest/GNUmakefile 2013-11-28 12:40:51.000000000 +0000
++++ jaffl-0.5.9/libtest/GNUmakefile 2013-11-26 16:44:45.000000000 +0000
+@@ -121,10 +121,12 @@
+
+ # On platforms (linux, solaris) that support both 32bit and 64bit, force building for one or the other
+ ifneq ($(or $(findstring linux, $(OS)), $(findstring solaris, $(OS))),)
+- # 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)
++ ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel))
++ # 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)
++ endif
+ endif
+
+ LIBTEST = $(BUILD_DIR)/$(LIBNAME)
diff --git a/debian/patches/series b/debian/patches/series
index ba750ea..c692ceb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
ftbfs-gcc-4.8.diff
string_array_support.diff
use_asm4.diff
+0004-mips-support.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jaffl.git
More information about the pkg-java-commits
mailing list