Add missing compiler option -fPIC. (hopefully closes: #545840)
Torsten Werner
14 years ago
0 | java3d (1.5.2+dfsg-4) unstable; urgency=low | |
1 | ||
2 | * Add missing compiler option -fPIC. (hopefully closes: #545840) | |
3 | ||
4 | -- Torsten Werner <twerner@debian.org> Tue, 15 Sep 2009 12:01:30 +0200 | |
5 | ||
0 | 6 | java3d (1.5.2+dfsg-3) unstable; urgency=low |
1 | 7 | |
2 | 8 | [ Onkar Shinde ] |
0 | diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml | |
1 | --- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-29 01:48:00.000000000 +0530 | |
2 | +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-08-11 20:37:25.000000000 +0530 | |
3 | @@ -28,7 +28,7 @@ | |
0 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml | |
1 | =================================================================== | |
2 | --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-28 21:18:00.000000000 +0100 | |
3 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-09-15 11:56:23.000000000 +0200 | |
4 | @@ -23,12 +23,12 @@ | |
5 | <!-- Compile the c source files--> | |
6 | <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build --> | |
7 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
8 | - <arg line="-w -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -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"/> | |
9 | + <arg line="-fPIC -w -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -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"/> | |
10 | </exec> | |
4 | 11 | |
5 | 12 | <!-- Create the library file--> |
6 | 13 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> |
0 | diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/build.xml java3d-1.5.2+dfsg.new/j3d-core/build.xml | |
1 | --- java3d-1.5.2+dfsg/j3d-core/build.xml 2008-05-24 02:01:19.000000000 +0530 | |
2 | +++ java3d-1.5.2+dfsg.new/j3d-core/build.xml 2009-08-14 09:43:53.000000000 +0530 | |
0 | Index: java3d-1.5.2+dfsg/j3d-core/build.xml | |
1 | =================================================================== | |
2 | --- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2008-05-23 22:31:19.000000000 +0200 | |
3 | +++ java3d-1.5.2+dfsg/j3d-core/build.xml 2009-09-15 11:56:34.000000000 +0200 | |
3 | 4 | @@ -196,6 +196,15 @@ |
4 | 5 | <property name="install.bin" value="lib/ppc"/> |
5 | 6 | </target> |
36 | 37 | <condition property="isSolarisOnSparc"> |
37 | 38 | <os name="SunOS" arch="sparc"/> |
38 | 39 | </condition> |
39 | diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/build.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/build.xml | |
40 | --- java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2008-02-29 01:47:58.000000000 +0530 | |
41 | +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/build.xml 2009-08-14 09:45:22.000000000 +0530 | |
40 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml | |
41 | =================================================================== | |
42 | --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2008-02-28 21:17:58.000000000 +0100 | |
43 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2009-09-15 11:56:34.000000000 +0200 | |
42 | 44 | @@ -45,6 +45,13 @@ |
43 | 45 | <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> |
44 | 46 | </target> |
85 | 87 | <property name="bldType" value="opt"/> |
86 | 88 | <property name="javahCoreSrc" |
87 | 89 | location="${src}/classes/share/javax/media/j3d"/> |
88 | diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml | |
89 | --- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 1970-01-01 05:30:00.000000000 +0530 | |
90 | +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml 2009-08-14 09:39:15.000000000 +0530 | |
90 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml | |
91 | =================================================================== | |
92 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | |
93 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2009-09-15 11:57:25.000000000 +0200 | |
91 | 94 | @@ -0,0 +1,74 @@ |
92 | 95 | +<?xml version="1.0"?> |
93 | 96 | + |
115 | 118 | + |
116 | 119 | + <!-- Compile the c source files--> |
117 | 120 | + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> |
118 | + <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
121 | + <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
119 | 122 | + </exec> |
120 | 123 | + |
121 | 124 | + <!-- Create the library file--> |
128 | 131 | + <target name="compile-ogl-cg" if="build.cg"> |
129 | 132 | + <!-- Compile the wrapper --> |
130 | 133 | + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> |
131 | + <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
134 | + <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
132 | 135 | + </exec> |
133 | 136 | + |
134 | 137 | + <!-- Create the wrapper library --> |
0 | diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ia64.xml | |
1 | --- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml 2008-02-29 01:48:00.000000000 +0530 | |
2 | +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ia64.xml 2009-08-14 00:33:04.000000000 +0530 | |
3 | @@ -29,7 +29,7 @@ | |
0 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml | |
1 | =================================================================== | |
2 | --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-ia64.xml 2008-02-28 21:18:00.000000000 +0100 | |
3 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml 2009-09-15 11:58:18.000000000 +0200 | |
4 | @@ -22,14 +22,14 @@ | |
5 | ||
6 | <!-- Compile the c source files; based on build-linux-amd64.xml--> | |
7 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
8 | - <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX -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"/> | |
9 | + <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX -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"/> | |
10 | </exec> | |
11 | ||
12 | <!-- Create the library file; based on build-linux-amd64.xml--> | |
4 | 13 | <!-- Must use gcc to link, not ld, hence also need -shared; refer to http://www.gelato.unsw.edu.au/linux-ia64/0006/0212.html --> |
5 | 14 | <!-- Removed -R/usr/openwin/lib - an ld specific option (should be a filename, not a dir?!?) --> |
6 | 15 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> |
0 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-amd64.xml | |
1 | =================================================================== | |
2 | --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-amd64.xml 2009-09-15 11:59:43.000000000 +0200 | |
3 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-amd64.xml 2009-09-15 12:00:03.000000000 +0200 | |
4 | @@ -25,7 +25,7 @@ | |
5 | <!-- Compile the c source files--> | |
6 | <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build --> | |
7 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
8 | - <arg line="-m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
9 | + <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
10 | </exec> | |
11 | ||
12 | <!-- Create the library file--> | |
13 | @@ -38,7 +38,7 @@ | |
14 | <target name="compile-ogl-cg" if="build.cg"> | |
15 | <!-- Compile the wrapper --> | |
16 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
17 | - <arg line="-m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
18 | + <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
19 | </exec> | |
20 | ||
21 | <!-- Create the wrapper library --> |
0 | Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-i586.xml | |
1 | =================================================================== | |
2 | --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-i586.xml 2009-09-15 12:00:21.000000000 +0200 | |
3 | +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-i586.xml 2009-09-15 12:00:47.000000000 +0200 | |
4 | @@ -25,7 +25,7 @@ | |
5 | <!-- Compile the c source files--> | |
6 | <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build --> | |
7 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
8 | - <arg line="-w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
9 | + <arg line="-fPIC -w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -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"/> | |
10 | </exec> | |
11 | ||
12 | <!-- Create the library file--> | |
13 | @@ -38,7 +38,7 @@ | |
14 | <target name="compile-ogl-cg" if="build.cg"> | |
15 | <!-- Compile the wrapper --> | |
16 | <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> | |
17 | - <arg line="-m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
18 | + <arg line="-fPIC -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> | |
19 | </exec> | |
20 | ||
21 | <!-- Create the wrapper library --> |