mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 03:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-java/gluegen: Debian patches

Browse Source 
Closes: https://bugs.gentoo.org/855470
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-07-05 11:06:28 +02:00
parent 9835d581ab
commit 1741005ef0
23 changed files with 1473 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
View File

@@ -1,14 +0,0 @@
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
<!-- updates / create the test results zip file -->
<target name="test-zip-archive" depends="init">
+ <!--
<archive.7z destfile="${build}/${test.archive.name}.7z"
basedir="${project.root}"
includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
+ -->
</target>

229
dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff Normal file
View File

@@ -0,0 +1,229 @@
Description: Add mips64(el) and mipsn32(el) support
Author: YunQiang Su <wzssyqa@gmail.com>, Dejan Latinovic <Dejan.Latinovic@imgtec.com>
Forwarded: no
--- a/make/build.xml
+++ b/make/build.xml
@@ -298,6 +298,30 @@
<property name="linker.cfg.id" value="linker.cfg.linux.mipsel" />
</target>
+ <target name="declare.linux.mipsn32" if="isLinuxMipsn32">
+ <echo message="Linux.mipsn32" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32" />
+ </target>
+
+ <target name="declare.linux.mipsn32el" if="isLinuxMipsn32el">
+ <echo message="Linux.mipsn32el" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32el" />
+ </target>
+
+ <target name="declare.linux.mips64" if="isLinuxMips64">
+ <echo message="Linux.mips64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mips64" />
+ </target>
+
+ <target name="declare.linux.mips64el" if="isLinuxMips64el">
+ <echo message="Linux.mips64el" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mips64el" />
+ </target>
+
<target name="declare.linux.ppc" if="isLinuxPpc">
<echo message="Linux.ppc" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -340,7 +364,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.mipsn32,declare.linux.mipsn32el,declare.linux.mips64,declare.linux.mips64el,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -47,6 +47,10 @@
- isLinuxHppa
- isLinuxMips
- isLinuxMipsel
+ - isLinuxMipsn32
+ - isLinuxMipsn32el
+ - isLinuxMips64
+ - isLinuxMipsn64el
- isLinuxPpc
- isLinuxPpc64
- isLinuxPpc64le
@@ -135,6 +139,10 @@
- compiler.cfg.linux.hppa
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
+ - compiler.cfg.linux.mipsn32
+ - compiler.cfg.linux.mipsn32el
+ - compiler.cfg.linux.mips64
+ - compiler.cfg.linux.mips64el
- compiler.cfg.linux.ppc
- compiler.cfg.linux.ppc64
- compiler.cfg.linux.ppc64le
@@ -160,6 +168,10 @@
- linker.cfg.linux.hppa
- linker.cfg.linux.mips
- linker.cfg.linux.mipsel
+ - linker.cfg.linux.mipsn32
+ - linker.cfg.linux.mipsn32el
+ - linker.cfg.linux.mips64
+ - linker.cfg.linux.mips64el
- linker.cfg.linux.ppc
- linker.cfg.linux.ppc64le
- linker.cfg.linux.s390
@@ -420,6 +432,42 @@
<condition property="mipsel">
<os arch="mipsel" />
</condition>
+ <condition property="isLinuxMipsn32">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mipsn32" />
+ </and>
+ </condition>
+ <condition property="mipsn32">
+ <os arch="mipsn32" />
+ </condition>
+ <condition property="isLinuxMipsn32el">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mipsn32el" />
+ </and>
+ </condition>
+ <condition property="mipsn32el">
+ <os arch="mipsn32el" />
+ </condition>
+ <condition property="isLinuxMips64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mips64" />
+ </and>
+ </condition>
+ <condition property="mips64">
+ <os arch="mips64" />
+ </condition>
+ <condition property="isLinuxMips64el">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mips64el" />
+ </and>
+ </condition>
+ <condition property="mips64el">
+ <os arch="mips64el" />
+ </condition>
<condition property="isLinuxPpc">
<and>
<istrue value="${isLinux}" />
@@ -639,6 +687,10 @@
<echo message="LinuxHppa=${isLinuxHppa}" />
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
+ <echo message="LinuxMips=${isLinuxMipsn32}" />
+ <echo message="LinuxMipsel=${isLinuxMipsn32el}" />
+ <echo message="LinuxMips=${isLinuxMips64}" />
+ <echo message="LinuxMipsel=${isLinuxMips64el}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
<echo message="LinuxPpc64=${isLinuxPpc64}" />
<echo message="LinuxPpc64le=${isLinuxPpc64le}" />
@@ -721,6 +773,22 @@
<property name="os.and.arch" value="linux-mipsel" />
</target>
+ <target name="gluegen.cpptasks.detect.os.linux.mipsn32" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32">
+ <property name="os.and.arch" value="linux-mipsn32" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mipsn32el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32el">
+ <property name="os.and.arch" value="linux-mipsn32el" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mips64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64">
+ <property name="os.and.arch" value="linux-mips64" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mips64el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64el">
+ <property name="os.and.arch" value="linux-mips64el" />
+ </target>
+
<target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
<property name="os.and.arch" value="linux-ppc" />
</target>
@@ -757,7 +825,7 @@
<property name="os.and.arch" value="android-aarch64" />
</target>
- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.mipsn32,gluegen.cpptasks.detect.os.linux.mipsn32el,gluegen.cpptasks.detect.os.linux.mips64,gluegen.cpptasks.detect.os.linux.mips64el,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
@@ -1308,6 +1376,18 @@
<linker id="linker.cfg.linux.mipsel" name="${gcc.compat.compiler}">
</linker>
+ <linker id="linker.cfg.linux.mipsn32" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mipsn32el" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mips64" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mips64el" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
@@ -1549,6 +1629,34 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsel" />
</target>
+ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32" if="isLinuxMipsn32">
+ <echo message="Linux.Mipsn32" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32el" if="isLinuxMipsn32el">
+ <echo message="Linux.Mipsn32el" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32el" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mips64" if="isLinuxMips64">
+ <echo message="Linux.Mips64" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mips64el" if="isLinuxMips64el">
+ <echo message="Linux.Mips64el" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64el" />
+ </target>
+
<target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
<echo message="Linux.Ppc" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
@@ -1591,7 +1699,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.mipsn32,gluegen.cpptasks.declare.compiler.linux.mipsn32el,gluegen.cpptasks.declare.compiler.linux.mips64,gluegen.cpptasks.declare.compiler.linux.mips64el,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
</target>

62
dev-java/gluegen/files/gluegen-2.3.2-armhf.diff Normal file
View File

@@ -0,0 +1,62 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -262,10 +262,16 @@
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
- <target name="declare.linux.armv6" if="isLinuxARMv6">
- <echo message="Linux.armv6" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" />
- <property name="linker.cfg.id" value="linker.cfg.linux.armv6" />
+ <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel">
+ <echo message="Linux.armv6.armel" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" />
+ </target>
+
+ <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf">
+ <echo message="Linux.armv6.armhf" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" />
</target>
<target name="declare.linux.alpha" if="isLinuxAlpha">
@@ -328,7 +334,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1032,7 +1032,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
- <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}">
+ <compiler id="compiler.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
<defineset>
<define name="__unix__"/>
<define name="__X11__" if="isX11"/>
@@ -1270,7 +1270,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
- <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}">
+ <linker id="linker.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
@@ -1286,6 +1286,9 @@
<linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
+ <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
</linker>

28
dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff Normal file
View File

@@ -0,0 +1,28 @@
Description: Disables the Java version check since the JRE in Debian always
meets the minimum requirement and the check routinely breaks with the latest JREs.
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -45,21 +45,6 @@
</condition>
</fail>
- <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
- <condition>
- <not>
- <or>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
- <equals arg1="${ant.java.version}" arg2="1.7"/>
- <equals arg1="${ant.java.version}" arg2="1.8"/>
- <equals arg1="${ant.java.version}" arg2="1.9"/>
- <equals arg1="${ant.java.version}" arg2="2.0"/>
- <equals arg1="${ant.java.version}" arg2="2.1"/>
- </or>
- </not>
- </condition>
- </fail>
-
</target>
<target name="jogamp.env.init" depends="jogamp.env.validation">

42
dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff Normal file
View File

@@ -0,0 +1,42 @@
Description: disable static linking for native libraries.
Author: Gilles Filippini <pini@debian.org>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1262,20 +1262,14 @@
<!-- Unix linker configuration -->
<linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!-- Using default compiler settings - utilize:
@@ -1286,16 +1280,12 @@
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">

11
dev-java/gluegen/files/gluegen-2.3.2-disable-test-zip-archive.diff Normal file
View File

@@ -0,0 +1,11 @@
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -505,7 +505,7 @@
</target>
<target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
- <antcall target="test-zip-archive" inheritRefs="true" />
+<!-- <antcall target="test-zip-archive" inheritRefs="true" />-->
</target>
<!--

26
dev-java/gluegen/files/gluegen-2.3.2-disableArchive7z.diff Normal file
View File

@@ -0,0 +1,26 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -1088,9 +1088,9 @@
<copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
<fileset dir="doc/javadoc/resources" includes="*" />
</copy>
- <archive.7z destfile="${build}/javadoc.7z"
+<!-- <archive.7z destfile="${build}/javadoc.7z"
basedir="${javadoc.root.path}"
- includes="gluegen/**" />
+ includes="gluegen/**" />-->
</target>
<!-- ================================================================== -->
@@ -1138,9 +1138,9 @@
<fileset dir="lib" includes="junit.jar"/>
</copy>
- <archive.7z destfile="${build}/${archive.name}.7z"
+<!-- <archive.7z destfile="${build}/${archive.name}.7z"
basedir="${build}"
- includes="${archive.name}/**" />
+ includes="${archive.name}/**" />-->
<!-- Clean up after ourselves -->
<delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
</target>

17
dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff Normal file
View File

@@ -0,0 +1,17 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -70,14 +70,6 @@
<property name="gluegen.build.number" value="manual"/>
<property name="gluegen.build.id" value="${version.timestamp}"/>
<mkdir dir="${build}" />
- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
- output="${build}/localbranch.raw">
- <arg line="branch --no-color"/>
- </exec>
- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
- outputproperty="gluegen.build.branch">
- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' '${build}/localbranch.raw'"/>
- </exec>
<property name="gluegen.build.branch" value="manual"/> <!-- fallback -->
<exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
outputproperty="gluegen.build.commit">

3
dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch → dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
View File

@@ -1,6 +1,6 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1511,17 +1511,6 @@
@@ -1872,16 +1872,6 @@
- Helper strip.libraries for stripping off debug information
-->
<target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
@@ -12,7 +12,6 @@
- <include name="**/*.so"/> <!-- unix -->
- <include name="**/*.dll"/> <!-- windows -->
- <include name="**/*.dylib"/> <!-- macosx -->
- <include name="**/*.jnilib"/> <!-- macosx -->
- </fileset>
- </apply>
</target>

11
dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -334,7 +334,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>

75
dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff Normal file
View File

@@ -0,0 +1,75 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -316,6 +316,12 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
</target>
+ <target name="declare.linux.aarch64" if="isLinuxAarch64">
+ <echo message="Linux.aarch64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" />
+ </target>
+
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -334,7 +340,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -50,6 +50,7 @@
- isLinuxPpc
- isLinuxPpc64
- isLinuxPpc64le
+ - isLinuxAarch64
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
@@ -137,6 +138,7 @@
- compiler.cfg.linux.ppc
- compiler.cfg.linux.ppc64
- compiler.cfg.linux.ppc64le
+ - compiler.cfg.linux.aarch64
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
@@ -440,6 +442,15 @@
<condition property="ppc64le">
<os arch="ppc64le" />
</condition>
+ <condition property="isLinuxAarch64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="aarch64" />
+ </and>
+ </condition>
+ <condition property="aarch64">
+ <os arch="aarch64" />
+ </condition>
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
@@ -626,6 +637,7 @@
<echo message="LinuxPpc=${isLinuxPpc}" />
<echo message="LinuxPpc64=${isLinuxPpc64}" />
<echo message="LinuxPpc64le=${isLinuxPpc64le}" />
+ <echo message="LinuxAarch64=${isLinuxAarch64}" />
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
@@ -1511,7 +1523,7 @@
<echo message="Linux.aarch64" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux.aarch64" />
<property name="linker.cfg.id.base" value="linker.cfg.linux.aarch64" />
- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" />
</target>
<target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">

18
dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch Normal file
View File

@@ -0,0 +1,18 @@
Description: Fix ftbfs with GCC-10
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Bug-Debian: https://bugs.debian.org/957276
Forwarded: no
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
@@ -299,9 +299,6 @@ MYAPI MYAPIConfig * MYAPIENTRY typeTest
#define HUGE_VALF_3 ((int) 1e53)
#define DOUBLE_DEFINE_BRACKETS_3 HUGE_VALF_3
-size_t unsigned_size_t_1;
-ptrdiff_t a_signed_pointer_t_1;
-
MYAPI int32_t MYAPIENTRY typeTestInt32T(const int32_t i1, int32_t i2);
MYAPI uint32_t MYAPIENTRY typeTestUInt32T(const uint32_t ui1, uint32_t ui2);
MYAPI int64_t MYAPIENTRY typeTestInt64T(const int64_t i1, int64_t i2);

18
dev-java/gluegen/files/gluegen-2.3.2-hideException.diff Normal file
View File

@@ -0,0 +1,18 @@
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -305,15 +305,6 @@ public class Platform extends PlatformPr
_USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
- // load GluegenRT native library
- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) {
- try {
- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.common.Debug.class }, null);
- } catch (final Exception e0) {
- // IllegalArgumentException, IOException
- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
- }
- }
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
// JVM bug workaround

263
dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch Normal file
View File

@@ -0,0 +1,263 @@
Description: Fixes the build failure with Java 10
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/java/net/highteq/nativetaglet/NativeTaglet.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package net.highteq.nativetaglet;
-
-import com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.Iterator;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-public class NativeTaglet implements Taglet
-{
- private Properties mapping= null;
- private static final String NAME = "native";
-
- /**
- * Return the name of this custom tag.
- */
- @Override
- public String getName()
- {
- return NAME;
- }
-
- /**
- * @return true since this tag can be used in a field
- * doc comment
- */
- @Override
- public boolean inField()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a constructor
- * doc comment
- */
- @Override
- public boolean inConstructor()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a method
- * doc comment
- */
- @Override
- public boolean inMethod()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in an overview
- * doc comment
- */
- @Override
- public boolean inOverview()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a package
- * doc comment
- */
- @Override
- public boolean inPackage()
- {
- return true;
- }
-
- /**
- * @return true since this
- */
- @Override
- public boolean inType()
- {
- return true;
- }
-
- /**
- * Will return true since this is an inline tag.
- *
- * @return true since this is an inline tag.
- */
-
- @Override
- public boolean isInlineTag()
- {
- return true;
- }
-
- /**
- * Register this Taglet.
- *
- * @param tagletMap the map to register this tag to.
- */
- public static void register(final Map tagletMap)
- {
- final NativeTaglet tag = new NativeTaglet();
- final Taglet t = (Taglet) tagletMap.get(tag.getName());
- if (t != null)
- {
- tagletMap.remove(tag.getName());
- }
- tagletMap.put(tag.getName(), tag);
- }
-
- /**
- * Given the <code>Tag</code> representation of this custom
- * tag, return its string representation.
- *
- * @param tag the <code>Tag</code> representation of this custom tag.
- */
- @Override
- public String toString(final Tag tag)
- {
- String text= tag.text().trim();
- if(mapping== null)
- {
- mapping= new Properties();
- InputStream in= null;
- try
- {
- URL url;
- try
- {
- url = new URL(System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
- }
- catch (final MalformedURLException e)
- {
- url = new URL("file:"+System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
- }
- in= url.openStream();
- mapping.load(in);
- }
- catch (final Exception e)
- {
- System.err.println("[NATIVE TAGLET] Could not read mapping file");
- System.err.println("-->");
- e.printStackTrace(System.err);
- System.err.println("<--");
- System.err.println("[NATIVE TAGLET] !!! NO LINKS WILL BE GENERATED !!!");
- }
- finally
- {
- if(in!=null) try{ in.close(); }catch(final Exception ignore){}
- }
- }
-
- if(mapping!=null)
- {
- // First check to see whether this key exists in the mapping
- String url = mapping.getProperty(text);
- if (url == null) {
- // Try iterating the keySet seeing if we can find a partial match
- // In the OpenGL spec this handles the case of glVertex -> glVertex3f
- for(final Iterator i= mapping.keySet().iterator(); i.hasNext();) {
- final String name= (String) i.next();
- if (hasOpenGLSuffix(text, name)) {
- url = mapping.getProperty(name);
- break;
- }
- }
- }
- if (url != null) {
- url = mapping.getProperty("nativetaglet.baseUrl", "") + url;
- text = "<a href=\"" + url + "\">" + text + "</a>";
- }
- }
- return text;
- }
-
- private static final String[] openGLSuffixes = {
- "b",
- "s",
- "i",
- "f",
- "d",
- "ub",
- "us",
- "ui",
- "bv",
- "sv",
- "iv",
- "fv",
- "dv",
- "ubv",
- "usv",
- "uiv"
- };
- private static boolean hasOpenGLSuffix(final String name,
- final String baseName) {
- if (!name.startsWith(baseName)) {
- return false;
- }
- for (int i = 0; i < openGLSuffixes.length; i++) {
- final String suffix = openGLSuffixes[i];
- if (name.endsWith(suffix)) {
- // First see whether it's a simple concatenation
- if (name.equals(baseName + suffix)) {
- return true;
- }
- // Now chop prefix and suffix off and see whether the
- // resulting is a number
- try {
- final String tmp = name.substring(baseName.length(),
- name.length() - suffix.length());
- if (tmp.length() == 1 &&
- Character.isDigit(tmp.charAt(0))) {
- return true;
- }
- } catch (final IndexOutOfBoundsException e) {
- }
- }
- }
- return false;
- }
-
- /**
- * This method should not be called since arrays of inline tags do not
- * exist. Method {@link #tostring(Tag)} should be used to convert this
- * inline tag to a string.
- *
- * @param tags the array of <code>Tag</code>s representing of this custom tag.
- */
- @Override
- public String toString(final Tag[] tags)
- {
- return null;
- }
-}
--- a/make/build.xml
+++ b/make/build.xml
@@ -466,9 +466,6 @@
<fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/>
<fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/>
- <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" />
- <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" />
- <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/>
<echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" />
@@ -746,6 +743,7 @@
<!-- Compile gluegen-rt first -->
<javac destdir="${classes}"
+ nativeHeaderDir="${src.generated.c}"
includeAntRuntime="false"
includes="${gluegen-rt.classes} ${jogamp.common.classes}"
excludes="${gluegen.excludes.all} ${java.part.android}"

11
dev-java/gluegen/files/gluegen-2.3.2-linker.diff Normal file
View File

@@ -0,0 +1,11 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1316,6 +1316,8 @@
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
</linker>
+
+
<compiler id="linker.cfg.android" name="${gcc.compat.compiler}">
<!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
</compiler>

39
dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff Normal file
View File

@@ -0,0 +1,39 @@
--- a/make/stub_includes/platform/glibc-compat-symbols.h
+++ b/make/stub_includes/platform/glibc-compat-symbols.h
@@ -15,35 +15,7 @@
*
* Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
*/
-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
- #if defined(__GNUC__)
- #if defined(__aarch64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__arm__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__amd64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
- #else
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
- #endif /*__amd64__*/
- #elif defined(__clang__)
- #if defined(__aarch64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__arm__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__amd64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
- #else
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0");
- #endif /*__amd64__*/
- #else
- #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
- #define GLIBC_COMPAT_SYMBOL(FFF)
- #endif
-#else
- #warning GLIBC_COMPAT_SYMBOL not supported with target OS
- #define GLIBC_COMPAT_SYMBOL(FFF)
-#endif
+#define GLIBC_COMPAT_SYMBOL(FFF)
GLIBC_COMPAT_SYMBOL(memcpy)

16
dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff Normal file
View File

@@ -0,0 +1,16 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -292,7 +292,12 @@
<os name="Android" />
</condition>
<condition property="isLinux">
- <os name="Linux" />
+ <or>
+ <os name="Linux" />
+ <!-- treat GNU/kFreeBSD or Hurd just as Linux -->
+ <os name="GNU/kFreeBSD" />
+ <os name="GNU" />
+ </or>
</condition>
<condition property="isSolaris">
<os name="SunOS" />

207
dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff Normal file
View File

@@ -0,0 +1,207 @@
Description: add support for ppc64el arch.
Author: Gilles Filippini <pini@debian.org>
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# -Dc.compiler.debug=true \
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxX86=true \
+# -DisX11=true \
+
+MACHINE=ppc64le
+ARCH=ppc64el
+TRIPLET=powerpc64le-linux-gnu
+
+export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
+export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
+
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+ -Drootrel.build=build-linux-$MACHINE \
+ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -48,6 +48,8 @@
- isLinuxMips
- isLinuxMipsel
- isLinuxPpc
+ - isLinuxPpc64
+ - isLinuxPpc64le
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
@@ -133,6 +135,8 @@
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
- compiler.cfg.linux.ppc
+ - compiler.cfg.linux.ppc64
+ - compiler.cfg.linux.ppc64le
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
@@ -155,6 +159,7 @@
- linker.cfg.linux.mips
- linker.cfg.linux.mipsel
- linker.cfg.linux.ppc
+ - linker.cfg.linux.ppc64le
- linker.cfg.linux.s390
- linker.cfg.linux.s390x
- linker.cfg.linux.sparc
@@ -417,6 +422,24 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
+ <condition property="isLinuxPpc64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc64" />
+ </and>
+ </condition>
+ <condition property="ppc64">
+ <os arch="ppc64" />
+ </condition>
+ <condition property="isLinuxPpc64le">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc64le" />
+ </and>
+ </condition>
+ <condition property="ppc64le">
+ <os arch="ppc64le" />
+ </condition>
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
@@ -601,6 +624,8 @@
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
+ <echo message="LinuxPpc64=${isLinuxPpc64}" />
+ <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
@@ -683,6 +708,14 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
+ <target name="gluegen.cpptasks.detect.os.linux.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64">
+ <property name="os.and.arch" value="linux-ppc64" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le">
+ <property name="os.and.arch" value="linux-ppc64le" />
+ </target>
+
<target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
<property name="os.and.arch" value="linux-s390" />
</target>
@@ -707,7 +740,7 @@
<property name="os.and.arch" value="android-aarch64" />
</target>
- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
@@ -1268,6 +1301,12 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
+ <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
</linker>
@@ -1505,6 +1544,20 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64" if="isLinuxPpc64">
+ <echo message="Linux.Ppc64" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le">
+ <echo message="Linux.Ppc64le" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" />
+ </target>
+
<target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
@@ -1526,7 +1579,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
</target>
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -522,6 +522,7 @@ public abstract class PlatformPropsImpl
* <li>linux-aarch64</li>
* <li>linux-amd64</li>
* <li>linux-ppc64</li>
+ * <li>linux-ppc64le</li>
* <li>linux-mips64</li>
* <li>linux-ia64</li>
* <li>linux-sparcv9</li>
@@ -578,7 +579,7 @@ public abstract class PlatformPropsImpl
_and_arch_tmp = "amd64";
break;
case PPC64:
- _and_arch_tmp = "ppc64";
+ _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64";
break;
case MIPS_64:
_and_arch_tmp = "mips64";
--- a/make/build.xml
+++ b/make/build.xml
@@ -306,6 +306,18 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
+ <target name="declare.linux.ppc64" if="isLinuxPpc64">
+ <echo message="Linux.ppc64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" />
+ </target>
+
+ <target name="declare.linux.ppc64le" if="isLinuxPpc64le">
+ <echo message="Linux.ppc64le" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
+ </target>
+
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -324,7 +336,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>

106
dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
View File

@@ -1,106 +0,0 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1216,21 +1216,12 @@
<!-- Unix linker configuration -->
- <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
- </linker>
-
<linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!-- Using default compiler settings - utilize:
@@ -1241,16 +1232,12 @@
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
@@ -1296,20 +1283,14 @@
<linker id="linker.cfg.solaris" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}">
<linkerarg value="-xarch=v9a" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
<!-- linkerarg value="-xarch=amd64" / -->
</linker>
@@ -1324,8 +1305,6 @@
<linkerarg value="-arch" if="use.macosx64"/>
<linkerarg value="x86_64" if="use.macosx64"/>
<linkerarg value="-mmacosx-version-min=10.5"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
<!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
</linker>
@@ -1334,16 +1313,12 @@
<!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"-->
<linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
<linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
<linkerarg value="-m32"/>
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
@@ -1351,8 +1326,6 @@
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
@@ -1360,8 +1333,6 @@
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">

67
dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff Normal file
View File

@@ -0,0 +1,67 @@
Description: No longer use rt.jar which is gone since Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/make/build.xml
+++ b/make/build.xml
@@ -729,7 +729,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<src path="${src.generated.java}" />
@@ -757,7 +756,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${host.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.jcpp}" />
<src path="${src.java}" />
@@ -914,7 +912,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<src path="${src.generated.java}" />
@@ -974,7 +971,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<classpath refid="android.classpath" />
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -183,13 +183,6 @@
<echo message="target.sourcelevel ${target.sourcelevel}"/>
<echo message="target.targetlevel ${target.targetlevel}"/>
<echo message="target.rt.jar ${target.rt.jar}"/>
- <fail message="No target.rt.jar specified not found.">
- <condition>
- <not>
- <isset property="target.rt.jar"/>
- </not>
- </condition>
- </fail>
<property name="host.sourcelevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
<property name="host.targetlevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
@@ -206,13 +199,6 @@
<echo message="host.sourcelevel ${host.sourcelevel}"/>
<echo message="host.targetlevel ${host.targetlevel}"/>
<echo message="host.rt.jar ${host.rt.jar}"/>
- <fail message="No host.rt.jar specified not found.">
- <condition>
- <not>
- <isset property="host.rt.jar"/>
- </not>
- </condition>
- </fail>
<fail message="Unsupported Target Java version (sourcelevel): ${target.sourcelevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
<condition>

138
dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff Normal file
View File

@@ -0,0 +1,138 @@
Description: add support for s390x arch.
Author: Gilles Filippini <pini@debian.org>
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-s390x.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# -Dc.compiler.debug=true \
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxX86=true \
+# -DisX11=true \
+
+MACHINE=s390x
+ARCH=s390x
+TRIPLET=s390x-linux-gnu
+
+export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
+export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
+
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+ -Drootrel.build=build-linux-$MACHINE \
+ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -527,6 +527,7 @@ public abstract class PlatformPropsImpl
* <li>linux-ia64</li>
* <li>linux-sparcv9</li>
* <li>linux-risc2.0</li>
+ * <li>linux-s390x</li>
* <li>freebsd-i586</li>
* <li>freebsd-amd64</li>
* <li>hpux-hppa</li>
@@ -593,6 +594,9 @@ public abstract class PlatformPropsImpl
case PA_RISC2_0:
_and_arch_tmp = "risc2.0";
break;
+ case S390X:
+ _and_arch_tmp = "s390x";
+ break;
default:
throw new InternalError("Unhandled CPUType: "+cpuType);
}
--- a/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
+++ b/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
@@ -412,6 +412,15 @@ public class ElfHeaderPart1 {
cpuName = "ppc64";
abiType = ABIType.GENERIC_ABI;
break;
+ case EM_S390:
+ // Can be 32 or 64 bits
+ if( 64 == getArchClassBits() ) {
+ cpuName = "s390x";
+ } else {
+ cpuName = "s390";
+ }
+ abiType = ABIType.GENERIC_ABI;
+ break;
case EM_SH:
cpuName = "superh";
abiType = ABIType.GENERIC_ABI;
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -77,7 +77,9 @@ public class Platform extends PlatformPr
/** Itanium */
IA64,
/** Hitachi SuperH */
- SuperH;
+ SuperH,
+ /** IBM ESA/390 and zSystems */
+ S390;
}
public enum CPUType {
@@ -118,9 +120,13 @@ public class Platform extends PlatformPr
/** SPARC 64bit, big endian */
SPARCV9_64(CPUFamily.SPARC, false),
/** PA_RISC2_0 64bit, ??? endian */
- PA_RISC2_0(CPUFamily.PA_RISC, false);
+ PA_RISC2_0(CPUFamily.PA_RISC, false),
// 17
+ /** S390X 64bit big endian */
+ S390X(CPUFamily.S390, true);
+ // 18
+
public final CPUFamily family;
public final boolean is32Bit;
@@ -201,6 +207,8 @@ public class Platform extends PlatformPr
return MIPS_32;
} else if( cpuABILower.startsWith("superh") ) {
return SuperH;
+ } else if( cpuABILower.equals("s390x") ) {
+ return S390X;
} else {
throw new RuntimeException("Please port CPUType detection to your platform (CPU_ABI string '" + cpuABILower + "')");
}
--- a/src/java/com/jogamp/common/os/MachineDataInfo.java
+++ b/src/java/com/jogamp/common/os/MachineDataInfo.java
@@ -73,6 +73,7 @@ public class MachineDataInfo {
private final static int[] align_sparc_32_sunos = { 1, 2, 4, 8, 4, 4, 4, 8, 8, 4 };
private final static int[] align_x86_32_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 4, 4 };
private final static int[] align_lp64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 16, 8 };
+ private final static int[] align_s390_64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 8, 8 };
private final static int[] align_x86_64_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 16, 8 };
/**
@@ -108,9 +109,11 @@ public class MachineDataInfo {
X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
/** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */
LP64_UNIX( size_lp64_unix, align_lp64_unix),
+ /** {@link Platform.CPUType#S390X} Unix */
+ S390_64_UNIX( size_lp64_unix, align_s390_64_unix),
/** {@link Platform.CPUType#X86_64} Windows */
X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
- // 8
+ // 9
public final MachineDataInfo md;
--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
} else {
if( osType == Platform.OSType.WINDOWS ) {
return StaticConfig.X86_64_WINDOWS;
+ } else if ( Platform.CPUType.S390X == cpuType ) {
+ return StaticConfig.S390_64_UNIX;
} else {
// for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
return StaticConfig.LP64_UNIX;

171
dev-java/gluegen/files/gluegen-2.3.2-tests.diff Normal file
View File

@@ -0,0 +1,171 @@
Description: enable testcases build and run.
One testcase can't build because of missing up to date semver-java:
- TestVersionSemantics
Three testcases fail on every arch while the library seems functional:
- TestUri99LaunchOnReservedCharPathBug908
- TestStructGen01
- TestStructGen02.
Author: Gilles Filippini <pini@debian.org>
--- gluegen2.orig/make/build-test.xml
+++ gluegen2/make/build-test.xml
@@ -84,6 +84,7 @@
<pathelement location="${junit.jar}" />
<pathelement location="${semver.jar}" />
<pathelement location="${gluegen.jar}" />
+ <pathelement location="/usr/share/java/jsr305.jar" />
</path>
<path id="junit.run.classpath">
--- gluegen2.orig/make/scripts/runtest.sh
+++ gluegen2/make/scripts/runtest.sh
@@ -42,7 +42,7 @@ rm -f $LOG
GLUEGEN_ROOT=`dirname $builddir`
ROOTREL_BUILD=`basename $builddir`
-X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT"
+X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT -Djava.library.path=$builddir/obj:$builddir/test/build/natives"
#D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
#D_ARGS="-Djogamp.debug.TraceLock"
#D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
@@ -64,12 +64,12 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -
#D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe"
#D_ARGS="-Djogamp.debug.ByteBufferInputStream"
#D_ARGS="-Djogamp.debug.Bitstream"
-#D_ARGS="-Djogamp.debug=all"
+D_ARGS="-Djogamp.debug=all"
#D_ARGS="-Djogamp.debug.Logging"
function onetest() {
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
- USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
+ USE_CLASSPATH=/usr/share/java/junit4.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../test/TestJarsInJar/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
libspath="$builddir"/test/build/natives
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes
@@ -88,66 +88,68 @@ function onetest() {
echo
}
#
+(cd $builddir/../test/TestJarsInJar && sh make.sh)
+#
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
-#onetest com.jogamp.common.util.TestLFRingBuffer01 $*
-#onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
+onetest com.jogamp.common.util.TestLFRingBuffer01 $*
+onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
+onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG

36
dev-java/gluegen/gluegen-2.3.2.ebuild
View File

@@ -4,6 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
inherit java-pkg-2 java-ant-2 toolchain-funcs
@@ -40,26 +41,42 @@ DEPEND="
dev-java/ant-junit4
)
"
BDEPEND="dev-vcs/git"
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-ppc64el-support.diff"
"${FILESDIR}/${PN}-2.3.2-disableArchive7z.diff"
"${FILESDIR}/${PN}-2.3.2-disable-test-zip-archive.diff"
"${FILESDIR}/${PN}-2.3.2-disable_git_call.diff"
"${FILESDIR}/${PN}-2.3.2-linker.diff"
"${FILESDIR}/${PN}-2.3.2-hideException.diff"
"${FILESDIR}/${PN}-2.3.2-armhf.diff"
"${FILESDIR}/${PN}-2.3.2-fix-alpha-build-config.patch"
"${FILESDIR}/${PN}-2.3.2-missing-arch-symbol.diff"
"${FILESDIR}/${PN}-2.3.2-fix-arm64-build-config.diff"
"${FILESDIR}/${PN}-2.3.2-tests.diff"
"${FILESDIR}/${PN}-2.3.2-disable-static-linking.diff"
"${FILESDIR}/${PN}-2.3.2-s390x-support.diff"
"${FILESDIR}/${PN}-2.3.2-non-linux-support.diff"
"${FILESDIR}/${PN}-2.3.2-disable-java-version-check.diff"
"${FILESDIR}/${PN}-2.3.2-rtjar.diff"
"${FILESDIR}/${PN}-2.3.2-add-mips64el-mipsn32-support.diff"
"${FILESDIR}/${PN}-2.3.2-java10-compatibility.patch"
"${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"
"${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
"${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
"${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch"
"${FILESDIR}/${P}-remove-static-lib.patch"
"${FILESDIR}/${P}-respect-flags.patch"
"${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
)
EANT_BUILD_TARGET="all.no_junit"
EANT_BUILD_XML="make/build.xml"
EANT_DOC_TARGET=""
EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
EANT_EXTRA_ARGS="-Dc.strip.libraries=false -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar= "
EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305"
EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
EANT_NEEDS_TOOLS="yes"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
EANT_TEST_TARGET="junit.run"
JAVA_ANT_REWRITE_CLASSPATH="yes"
WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
src_prepare() {
tc-export CC
@@ -67,13 +84,6 @@ src_prepare() {
rm -rf make/lib || die
default
java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml"
#it want a git repo
git init || die
git config --global user.email "you@example.com" || die
git config --global user.name "Your Name" || die
git add . || die
git commit -m 'init' || die
}
src_test() {