This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository java3d.
commit 37b91bdedb5d957bec807c53354af001dbae071b
Author: tony mancill <tmanc...@debian.org>
Date: Tue Mar 27 20:57:48 2018 -0700
Link with gcc -shared, not ld; don't explicitly link with libc.
(Closes: #894063)
- Thank you to Matthias Klose for the patch.
---
debian/patches/02_fix_generic_ftbfs.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/02_fix_generic_ftbfs.patch
b/debian/patches/02_fix_generic_ftbfs.patch
index b4e22d0..fb12270 100644
--- a/debian/patches/02_fix_generic_ftbfs.patch
+++ b/debian/patches/02_fix_generic_ftbfs.patch
@@ -120,8 +120,8 @@
+ </exec>
+
+ <!-- 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/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc
-L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt
-L${java.home}/lib/${os.arch}/server -L${java.home}/lib/${os.arch}/client
-L${java.home}/lib/server -L${java.home}/lib/client -ljvm -o libj3dcore-o [...]
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs"
executable="gcc">
++ <arg line="-shared DrawingSurfaceObjectAWT.o Canvas3D.o
GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o
MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o
GLSLShaderProgram.o Lights.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lGL -lX11
-lXext -lm -lnsl -L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt
-L${java.home}/lib/${os.arch}/server -L${java.home}/lib/${os.arch}/client
-L${java.home}/lib/server -L${java.home}/lib/client -ljvm -o libj3dc [...]
+ </exec>
+
+ </target>
@@ -133,8 +133,8 @@
+ </exec>
+
+ <!-- Create the wrapper library -->
-+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs"
executable="ld">
-+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib -ldl -lCg -lCgGL
-lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs"
executable="gcc">
++ <arg line="CgWrapper.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lCg -lCgGL
-lpthread -lGL -lX11 -lXext -lm -lnsl -o libj3dcore-ogl-cg.so"/>
+ </exec>
+
+ </target>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/java3d.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
