1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From: Steven Chamberlain <steven@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
---
build.xml | 7 +++++++
jni/jffi/endian.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
Index: jffi/build.xml
===================================================================
--- jffi.orig/build.xml
+++ jffi/build.xml
@@ -102,6 +102,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>
Index: jffi/jni/jffi/endian.h
===================================================================
--- jffi.orig/jni/jffi/endian.h
+++ jffi/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
|