diff options
| author |   Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-15 00:48:34 +0100 |
|---|---|---|
| committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-15 00:48:34 +0100 |
| commit | e376f26cf1b691dafffa087ffe7559038e81db76 (patch) | |
| tree | d359e7f3b238b782bc8f8f26e116241fe9315713 /dev-java/jogl/files | |
| parent | dev-java/jcip-annotations: import from the java overlay (diff) | |
| download | sci-e376f26cf1b691dafffa087ffe7559038e81db76.tar.gz sci-e376f26cf1b691dafffa087ffe7559038e81db76.tar.bz2 sci-e376f26cf1b691dafffa087ffe7559038e81db76.zip | |
dev-java/jogl: import from the java overlay
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-java/jogl/files')
| -rw-r--r-- | dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch | 41 | ||||
| -rw-r--r-- | dev-java/jogl/files/1.1.0/uncouple-gluegen.patch | 32 |
2 files changed, 73 insertions, 0 deletions
diff --git a/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch b/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch new file mode 100644 index 000000000..6d77bc3fe --- /dev/null +++ b/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch @@ -0,0 +1,41 @@ +diff -Naur gluegen.orig/make/gluegen-cpptasks.xml gluegen/make/gluegen-cpptasks.xml +--- gluegen.orig/make/gluegen-cpptasks.xml 2007-03-14 23:09:20.000000000 +1300 ++++ gluegen/make/gluegen-cpptasks.xml 2007-03-14 23:09:40.000000000 +1300 +@@ -397,16 +397,16 @@ + <compilerarg value="-fPIC"/> + </compiler> + +- <compiler id="compiler.cfg.solaris" name="suncc"> ++ <compiler id="compiler.cfg.solaris" name="gcc"> + </compiler> + +- <compiler id="compiler.cfg.solaris.sparcv9" name="suncc"> ++ <compiler id="compiler.cfg.solaris.sparcv9" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=ultra" /> + <compilerarg value="-xarch=v9a" /> + </compiler> + +- <compiler id="compiler.cfg.solaris.amd64" name="suncc"> ++ <compiler id="compiler.cfg.solaris.amd64" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=opteron" /> + <compilerarg value="-xarch=amd64" /> +@@ -492,14 +492,14 @@ + <linker id="linker.cfg.linux.amd64" name="gcc"> + </linker> + +- <linker id="linker.cfg.solaris" name="suncc"> ++ <linker id="linker.cfg.solaris" name="gcc"> + </linker> + +- <linker id="linker.cfg.solaris.sparcv9" name="suncc"> ++ <linker id="linker.cfg.solaris.sparcv9" name="gcc"> + <linkerarg value="-xarch=v9a" /> + </linker> + +- <linker id="linker.cfg.solaris.amd64" name="suncc"> ++ <linker id="linker.cfg.solaris.amd64" name="gcc"> + <linkerarg value="-xarch=amd64" /> + </linker> + diff --git a/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch b/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch new file mode 100644 index 000000000..a508c610f --- /dev/null +++ b/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch @@ -0,0 +1,32 @@ +diff -Naur jogl.orig/make/build.xml jogl/make/build.xml +--- jogl.orig/make/build.xml 2007-02-13 17:45:16.000000000 +1300 ++++ jogl/make/build.xml 2007-03-14 22:55:50.000000000 +1300 +@@ -127,7 +127,18 @@ + <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" /> + <property name="gluegen.jar" value="../../gluegen/build/gluegen.jar" /> + <property name="gluegen-rt.jar" value="../../gluegen/build/gluegen-rt.jar" /> +- ++ <!-- This property is used to skip building gluegen if the jar files ++ - are already available on the system and have been overridden ++ - by the user. The purpose is to allow linux distro's to uncouple ++ - gluegen from jogl. ++ --> ++ <condition property="gluegen.prebuilt" > ++ <and> ++ <available file="${gluegen.jar}" /> ++ <available file="${gluegen-rt.jar}" /> ++ </and> ++ </condition> ++ + <!-- Names of directories relative to the project root. + Some of these are used in FileMappers later for dependence information + and need exact string matching, which is why they use file.separator +@@ -479,7 +490,7 @@ + <!-- + - Build GlueGen + --> +- <target name="build.gluegen" depends="init"> ++ <target name="build.gluegen" depends="init" unless="gluegen.prebuilt"> + <!-- Run the GlueGen build to ensure that the GlueGen ANT task + - has been built. --> + <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all |