diff options
| -rw-r--r-- | java/bouncycastle15/Makefile | 5 | ||||
| -rw-r--r-- | java/bouncycastle15/files/armv6-patch-bc+-build.xml | 37 |
2 files changed, 42 insertions, 0 deletions
diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile index 3f517c7467e6..39d6b665c4d5 100644 --- a/java/bouncycastle15/Makefile +++ b/java/bouncycastle15/Makefile @@ -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 \ diff --git a/java/bouncycastle15/files/armv6-patch-bc+-build.xml b/java/bouncycastle15/files/armv6-patch-bc+-build.xml new file mode 100644 index 000000000000..65834ac9ee6b --- /dev/null +++ b/java/bouncycastle15/files/armv6-patch-bc+-build.xml @@ -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" /> |