[jffi] 01/02: add Steven Chamberlain's patches to build on kFreeBSD and Hurd

Tony Mancill tmancill at moszumanska.debian.org
Wed Dec 23 16:53:57 UTC 2015


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

tmancill pushed a commit to branch master
in repository jffi.

commit a98cbf693f77dd6d7376021e25f80afedad32773
Author: tony mancill <tmancill at debian.org>
Date:   Wed Dec 23 08:41:22 2015 -0800

    add Steven Chamberlain's patches to build on kFreeBSD and Hurd
    
    See Debian bug 808175.
---
 debian/patches/nonlinux-platforms.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/nonlinux-platforms.patch b/debian/patches/nonlinux-platforms.patch
new file mode 100644
index 0000000..e8354f1
--- /dev/null
+++ b/debian/patches/nonlinux-platforms.patch
@@ -0,0 +1,32 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Date: Wed, 16 Dec 2015 18:56:35 +0000
+Subject: just use platform=Linux for GNU/kFreeBSD and Hurd
+Bug-Debian: http://bugs.debian.org/808175
+
+--- a/build.xml
++++ b/build.xml
+@@ -93,6 +93,13 @@
+     <condition property="platform.os" value="Windows">
+       <os family="Windows"/>
+     </condition>
++    <!-- Treat GNU/kFreeBSD or Hurd just like Linux platform -->
++    <condition property="platform.os" value="Linux">
++      <or>
++        <os name="GNU/kFreeBSD"/>
++        <os name="GNU"/>
++      </or>
++    </condition>
+     <!-- default to os.arch for the cpu -->
+     <condition property="platform.cpu" value="${os.arch}">
+       <not><isset property="platform.cpu"/></not>
+--- a/jni/jffi/endian.h
++++ b/jni/jffi/endian.h
+@@ -36,7 +36,7 @@
+ #include <sys/param.h>
+ #include <sys/types.h>
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #  include_next <endian.h>
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7cdb607..2ec8253 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ junit_path_for_tests.patch
 disable-warnings-as-errors-for-libtest.patch
 test_fork_true.patch
 remove-unnecessary-target-for-native-build.patch
+nonlinux-platforms.patch

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



More information about the pkg-java-commits mailing list