diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2019-01-02 09:32:49 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2019-01-02 09:32:49 +0000 |
| commit | 181b8c8b102e012ec2cc2946faf8093db6413dee (patch) | |
| tree | 3ab042f3847e6d0677c03b5037432f2d80a827e7 /java/java3d | |
| parent | - Update WWW (diff) | |
Correct mistakes made in r484256 by not including newer version of
patch. This correctly fixes the build on powerpc64.
PR: 231946
Submitted by: Piotr Kubaj
Approved by: portmgr (tier-2 blanket)
Notes
Notes:
svn path=/head/; revision=489072
Diffstat (limited to 'java/java3d')
| -rw-r--r-- | java/java3d/Makefile | 2 | ||||
| -rw-r--r-- | java/java3d/files/patch-freebsd | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/java3d/Makefile b/java/java3d/Makefile index 00434409bae5..33035fab57c5 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -60,12 +60,10 @@ do-install: ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \ ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \ ${STAGEDIR}${JAVA_HOME}/jre/lib/ext -.if ${ARCH} != powerpc64 @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} ${INSTALL} \ ${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \ ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} -.endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd index 066f2ac3ebb8..e11a2df2c13c 100644 --- a/java/java3d/files/patch-freebsd +++ b/java/java3d/files/patch-freebsd @@ -126,7 +126,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s + + <!-- Compile the c source files--> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> -+ <arg line="-fPIC -march=k8 -I${oglsrc} -I${ports.localbase}/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/> ++ <arg line="-fPIC -I${oglsrc} -I${ports.localbase}/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/> + </exec> + + <!-- Create the library file--> @@ -139,7 +139,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s + <target name="compile-ogl-cg" if="build.cg"> + <!-- Compile the wrapper --> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> -+ <arg line="-march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> ++ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> + </exec> + + <!-- Create the wrapper library --> |