aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2018-06-29 13:37:54 +0000
committerAlex Dupre <ale@FreeBSD.org>2018-06-29 13:37:54 +0000
commit20e1f95178e17fb123e9ed6b0767d8c351b3c0c7 (patch)
tree0ffcf6d4a454c65b3fc2a0643ec98a622eedadc1
parenta7ef4431088fa2a5082b3db9073facc3fb25c026 (diff)
downloadports-20e1f95178e17fb123e9ed6b0767d8c351b3c0c7.tar.gz
ports-20e1f95178e17fb123e9ed6b0767d8c351b3c0c7.zip
Fix build on aarch64, armv6, armv7.
PR: 229382 Submitted by: tobik
Notes
Notes: svn path=/head/; revision=473549
-rw-r--r--devel/jakarta-commons-daemon/Makefile4
-rw-r--r--devel/jakarta-commons-daemon/files/patch-configure11
2 files changed, 11 insertions, 4 deletions
diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index 2cabf90b1d8a..7097bf08277a 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -15,10 +15,6 @@ COMMENT= Wrapper code to start/stop a Java application as a daemon
LICENSE= APACHE20
-BROKEN_aarch64= fails to compile: 'jni_md.h' file not found
-BROKEN_armv6= fails to compile: 'jni_md.h' file not found
-BROKEN_armv7= fails to compile: 'jni_md.h' file not found
-
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
diff --git a/devel/jakarta-commons-daemon/files/patch-configure b/devel/jakarta-commons-daemon/files/patch-configure
new file mode 100644
index 000000000000..240a0979310e
--- /dev/null
+++ b/devel/jakarta-commons-daemon/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2018-06-29 12:40:33 UTC
++++ configure
+@@ -3504,7 +3504,7 @@ then
+ $as_echo "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; }
+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
+ else
+- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
++ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
+ fi
+
+ if test "$GCC" = "yes"