svn commit: r473549 - in head/devel/jakarta-commons-daemon: . files

[Alex Dupre]

Author: ale
Date: Fri Jun 29 13:37:54 2018
New Revision: 473549
URL: https://svnweb.freebsd.org/changeset/ports/473549

Log:
  Fix build on aarch64, armv6, armv7.
  
  PR:		229382
  Submitted by:	tobik

Added:
  head/devel/jakarta-commons-daemon/files/patch-configure   (contents, props changed)
Modified:
  head/devel/jakarta-commons-daemon/Makefile

Modified: head/devel/jakarta-commons-daemon/Makefile
==============================================================================
--- head/devel/jakarta-commons-daemon/Makefile	Fri Jun 29 13:09:45 2018	(r473548)
+++ head/devel/jakarta-commons-daemon/Makefile	Fri Jun 29 13:37:54 2018	(r473549)
@@ -15,10 +15,6 @@ COMMENT=	Wrapper code to start/stop a Java application
 
 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

Added: head/devel/jakarta-commons-daemon/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/jakarta-commons-daemon/files/patch-configure	Fri Jun 29 13:37:54 2018	(r473549)
@@ -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"