Date: Wed, 2 Jan 2019 09:48:07 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489073 - in branches/2019Q1/java/java3d: . files Message-ID: <201901020948.x029m7xP074405@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Wed Jan 2 09:48:07 2019 New Revision: 489073 URL: https://svnweb.freebsd.org/changeset/ports/489073 Log: MFH: r489072 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) Approved by: portmgr (tier-2 blanket) Modified: branches/2019Q1/java/java3d/Makefile branches/2019Q1/java/java3d/files/patch-freebsd Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/java/java3d/Makefile ============================================================================== --- branches/2019Q1/java/java3d/Makefile Wed Jan 2 09:32:49 2019 (r489072) +++ branches/2019Q1/java/java3d/Makefile Wed Jan 2 09:48:07 2019 (r489073) @@ -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} Modified: branches/2019Q1/java/java3d/files/patch-freebsd ============================================================================== --- branches/2019Q1/java/java3d/files/patch-freebsd Wed Jan 2 09:32:49 2019 (r489072) +++ branches/2019Q1/java/java3d/files/patch-freebsd Wed Jan 2 09:48:07 2019 (r489073) @@ -126,7 +126,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/buil + + <!-- 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/buil + <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 -->
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901020948.x029m7xP074405>