From 35901ec129986f9f9d26f75b8dbeb2d5e6b6faf4 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 13 Aug 2025 17:51:44 +0200
Subject: java/java3d: Fix build with lld

Replace Solaris -G flag with -shared.
---
 java/java3d/files/patch-freebsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/java3d/files/patch-freebsd')

diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
index e11a2df2c13c..51aeaa4399a5 100644
--- a/java/java3d/files/patch-freebsd
+++ b/java/java3d/files/patch-freebsd
@@ -131,7 +131,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +
 +    <!-- Create the library file-->
 +    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -shared -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
 +    </exec>
 +
 +  </target>
@@ -144,7 +144,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +
 +    <!-- Create the wrapper library -->
 +    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+	<arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
++	<arg line="CgWrapper.o -shared -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
 +    </exec>
 +
 +  </target>
-- 
cgit v1.2.3


From ae151e331161de22352a63ea9718ba4029411612 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sat, 27 Sep 2025 20:22:40 +0200
Subject: java/java3d: Various fixes

- Add dependency on libX11 and libXext.
- Replace ${SETENV} with ${SETENVI} ${WRK_ENV} to build with a clean
  environment.
- Install the library with ${INSTALL_LIB} so it is stripped.
- Link with C compiler because ld doesn't always search /usr/lib.

Reported by:	vvd
---
 java/java3d/files/patch-freebsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/java3d/files/patch-freebsd')

diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
index 51aeaa4399a5..7e5635a72e8e 100644
--- a/java/java3d/files/patch-freebsd
+++ b/java/java3d/files/patch-freebsd
@@ -130,7 +130,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +    </exec>
 +
 +    <!-- Create the library file-->
-+    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
 +	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -shared -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
 +    </exec>
 +
@@ -143,7 +143,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +    </exec>
 +
 +    <!-- Create the wrapper library -->
-+    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
 +	<arg line="CgWrapper.o -shared -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
 +    </exec>
 +
-- 
cgit v1.2.3