svn commit: r445468 - in head/java/bouncycastle15: . files
Eugene Grosbein
eugen at FreeBSD.org
Tue Jul 11 05:38:33 UTC 2017
Author: eugen
Date: Tue Jul 11 05:38:31 2017
New Revision: 445468
URL: https://svnweb.freebsd.org/changeset/ports/445468
Log:
Fix build of java/bouncycastle15 on armv6:
remove fork="true" in javac and fork="yes" in junit tasks (ant/bc+-build.xml)
Original report:
If java/bouncycastle15 is build on armv6 with openjdk18, the build stops with
This command is not for general use and should only be run as the result of a call to ProcessBuilder.start() or Runtime.exec() in a java application
PR: 220612
Submitted by: Gerrit Beine <mail+freebsd at gerritbeine.de> (based on)
Approved by: az (mentor)
Added:
head/java/bouncycastle15/files/
head/java/bouncycastle15/files/armv6-patch-bc+-build.xml (contents, props changed)
Modified:
head/java/bouncycastle15/Makefile
Modified: head/java/bouncycastle15/Makefile
==============================================================================
--- head/java/bouncycastle15/Makefile Tue Jul 11 04:13:11 2017 (r445467)
+++ head/java/bouncycastle15/Makefile Tue Jul 11 05:38:31 2017 (r445468)
@@ -47,6 +47,11 @@ PORTDOCS= *
.include <bsd.port.options.mk>
+# PR 220612: remove fork="true" in javac and fork="yes" in junit tasks
+.if ${ARCH}=="armv6"
+EXTRA_PATCHES+= ${FILESDIR}/armv6-patch-bc+-build.xml
+.endif
+
do-install:
.for jar in ${JARS}
${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}on-${DVERSION}.jar \
Added: head/java/bouncycastle15/files/armv6-patch-bc+-build.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/bouncycastle15/files/armv6-patch-bc+-build.xml Tue Jul 11 05:38:31 2017 (r445468)
@@ -0,0 +1,37 @@
+--- ant/bc+-build.xml.orig 2017-05-03 05:05:26 UTC
++++ ant/bc+-build.xml
+@@ -107,7 +107,7 @@
+ srcdir="${artifacts.dir}/@{target}/src"
+ destdir="${build.dir}/@{target}/classes"
+ memoryMaximumSize="512m"
+- debug="${release.debug}" fork="true">
++ debug="${release.debug}">
+ <classpath>
+ <path refid="project.classpath" />
+ <fileset dir="${artifacts.jars.dir}">
+@@ -282,7 +282,6 @@
+ srcdir="${lcrypto.target.src.dir}"
+ destdir="${lcrypto.target.classes.dir}"
+ memoryMaximumSize="512m"
+- fork="true"
+ debug="${release.debug}">
+ <classpath>
+ <path refid="project.classpath" />
+@@ -762,7 +761,7 @@
+
+ <target name="test">
+ <mkdir dir="${basedir}/${build.dir}/${target.prefix}" />
+- <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
++ <junit dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
+ <classpath>
+ <path refid="project.classpath" />
+ <fileset dir="${artifacts.jars.dir}">
+@@ -789,7 +788,7 @@
+ </target>
+
+ <target name="test-lw">
+- <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
++ <junit dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
+ <classpath>
+ <fileset dir="${artifacts.jars.dir}">
+ <include name="**/*.jar" />
More information about the svn-ports-all
mailing list