Attachment 161657 Details for Bug 203511 – patch to fix build with OpenJDK8

[patch] patch to fix build with OpenJDK8

scilab.diff (text/plain), 2.85 KB, created by Steve Wills on 2015-10-02 19:15:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2015-10-02 19:15:45 UTC

Size: 2.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398211)
>+++ Makefile	(working copy)
>@@ -115,6 +115,12 @@
> CONFIGURE_ARGS+=	--without-openmp
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${JAVA_PORT_VERSION:M1.8.*}
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
>+.endif
>+
> post-patch:
> 	@# Configure fixes
> 	@${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
>@@ -161,4 +167,4 @@
> 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
> 		${MAKE_ARGS} check)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/extra-patch-Makefile.in
>===================================================================
>--- files/extra-patch-Makefile.in	(revision 0)
>+++ files/extra-patch-Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	2015-10-02 17:25:36.689224000 +0000
>++++ Makefile.in	2015-10-02 17:25:47.634538000 +0000
>+@@ -2110,7 +2110,7 @@
>+ # This is not done in the module itself because its needs also the "types"
>+ # module
>+ javadoc:
>+-	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
>++	$(JAVADOC) -Xdoclint:none -noindex -nohelp -nonavbar -notree \
>+ 	-d $(top_builddir)/modules/javasci/javadoc \
>+ 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java::$(top_srcdir)/modules/localization/src/java \
>+ 	org.scilab.modules.javasci org.scilab.modules.types
>
>Property changes on: files/extra-patch-Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 0)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.orig	2015-10-02 17:09:45.251035000 +0000
>++++ configure	2015-10-02 17:07:21.796652000 +0000
>+@@ -11863,7 +11863,7 @@
>+             fi
>+         fi
>+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
>+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
>++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm -pthread"
>+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
>+                 if test -d $D; then
>+                   ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 203511: 161657