forked from pool/gluegen2
Compare commits
22 Commits
15c1035205
...
182361c19c
Author | SHA256 | Date | |
---|---|---|---|
182361c19c | |||
cc2ca64677 | |||
1839d37fd9 | |||
596ff95507 | |||
17bc48ad88 | |||
0ba78ad039 | |||
3764df0438 | |||
a51fc98042 | |||
854538a371 | |||
1fb427f63f | |||
774a9f1d84 | |||
b0ec447eb1 | |||
9b53572833 | |||
8737d2cb2b | |||
d955e04ea8 | |||
104de4d504 | |||
f55ef46d9c | |||
10cd7833ae | |||
7b294174ed | |||
3b4ec999f4 | |||
|
837b0fd859 | ||
|
67d0aa3ba8 |
41
gluegen2-0005-use-system-antlib.patch
Normal file
41
gluegen2-0005-use-system-antlib.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
--- a/make/jogamp-androidtasks.xml
|
||||
+++ b/make/jogamp-androidtasks.xml
|
||||
@@ -1,11 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="jogamp-androidtasks" basedir=".">
|
||||
<dirname property="jogamp-androidtasks.basedir" file="${ant.file.jogamp-androidtasks}"/>
|
||||
- <taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||
- <classpath>
|
||||
- <pathelement location="${jogamp-androidtasks.basedir}/lib/ant-contrib-1.0b3.jar"/>
|
||||
- </classpath>
|
||||
- </taskdef>
|
||||
+ <taskdef resource="net/sf/antcontrib/antlib.xml" />
|
||||
|
||||
<target name="test.regexp1" >
|
||||
<property name="jarbasename" value="gluegen-rt-android" />
|
||||
--- a/make/gluegen-cpptasks.xml
|
||||
+++ b/make/gluegen-cpptasks.xml
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<!-- import cpptasks -->
|
||||
<!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/-->
|
||||
- <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
|
||||
+ <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" />
|
||||
|
||||
<!-- 0 fetch environment variable GLUEGEN_CPPTASKS_FILE -> gluegen-cpptasks.file -->
|
||||
<property environment="env" />
|
||||
--- a/make/jogamp-archivetasks.xml
|
||||
+++ b/make/jogamp-archivetasks.xml
|
||||
@@ -1,11 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="jogamp-archivetasks" basedir=".">
|
||||
<dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/>
|
||||
- <taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||
- <classpath>
|
||||
- <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/>
|
||||
- </classpath>
|
||||
- </taskdef>
|
||||
+ <taskdef resource="net/sf/antcontrib/antlib.xml" />
|
||||
|
||||
<macrodef name="archive.7z">
|
||||
<attribute name="basedir" />
|
@@ -1,100 +1,128 @@
|
||||
Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.2.orig/make/gluegen-cpptasks-base.xml
|
||||
+++ gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
@@ -1218,19 +1218,16 @@
|
||||
--- a/make/stub_includes/platform/glibc-compat-symbols.h
|
||||
+++ b/make/stub_includes/platform/glibc-compat-symbols.h
|
||||
@@ -45,6 +45,8 @@
|
||||
#define GLIBC_COMPAT_SYMBOL(FFF)
|
||||
#endif
|
||||
|
||||
+#undef GLIBC_COMPAT_SYMBOL
|
||||
+#define GLIBC_COMPAT_SYMBOL(FFF)
|
||||
GLIBC_COMPAT_SYMBOL(memcpy)
|
||||
|
||||
#endif /*__GLIBC_COMPAT_SYMBOLS_H__*/
|
||||
--- a/make/gluegen-cpptasks-base.xml
|
||||
+++ b/make/gluegen-cpptasks-base.xml
|
||||
@@ -1217,20 +1217,14 @@
|
||||
<!-- Unix linker configuration -->
|
||||
|
||||
<linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <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-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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<!-- Using default compiler settings - utilize:
|
||||
@@ -1242,7 +1239,6 @@
|
||||
@@ -1241,16 +1235,12 @@
|
||||
<linkerarg value="-fpic" />
|
||||
<linkerarg value="-nostdlib" />
|
||||
<linkerarg value="-Bdynamic" />
|
||||
<linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
|
||||
@@ -1250,7 +1246,6 @@
|
||||
- <linkerarg value="-fpic" />
|
||||
+ <linkerarg value="-fpic" />
|
||||
<linkerarg value="-nostdlib" />
|
||||
<linkerarg value="-Bdynamic" />
|
||||
<linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
|
||||
@@ -1297,19 +1292,16 @@
|
||||
@@ -1296,20 +1286,14 @@
|
||||
|
||||
<linker id="linker.cfg.solaris" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-m32"/>
|
||||
<linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <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-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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
<!-- linkerarg value="-xarch=amd64" / -->
|
||||
</linker>
|
||||
|
||||
@@ -1325,7 +1317,6 @@
|
||||
@@ -1324,8 +1308,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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
<!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
|
||||
</linker>
|
||||
|
||||
@@ -1335,7 +1326,6 @@
|
||||
@@ -1334,16 +1316,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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
|
||||
@@ -1343,7 +1333,6 @@
|
||||
<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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
|
||||
@@ -1352,7 +1341,6 @@
|
||||
@@ -1351,8 +1329,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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
|
||||
@@ -1361,7 +1349,6 @@
|
||||
@@ -1360,8 +1336,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-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">
|
||||
--- a/make/lib/gluegen-cpptasks-android-armv6.xml
|
||||
+++ b/make/lib/gluegen-cpptasks-android-armv6.xml
|
||||
@@ -110,8 +110,6 @@
|
||||
<linkerarg value="--demangle" />
|
||||
<linkerarg value="--gc-sections" />
|
||||
<linkerarg value="--no-undefined" />
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
<!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told
|
||||
where to find libgcc as the default location (gcc -print-search-dirs)
|
||||
is not correct. Not sure if this is a bug in the NDK or not. We also
|
@@ -1,23 +1,21 @@
|
||||
From 5309186d0bc361011b91c176f229a598496a5bf2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 18 Feb 2015 17:30:28 +0000
|
||||
Subject: Add support for aarch64/ppc64
|
||||
|
||||
patch retrieved from Fedora DB
|
||||
and adapted to gluegen2 version 2.3.1
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
|
||||
---
|
||||
make/build.xml | 20 +++++++++++
|
||||
make/gluegen-cpptasks-base.xml | 70 +++++++++++++++++++++++++++++++++++++++--
|
||||
2 files changed, 87 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: gluegen-v2.3.2/make/build.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.2.orig/make/build.xml
|
||||
+++ gluegen-v2.3.2/make/build.xml
|
||||
@@ -306,6 +306,24 @@
|
||||
@@ -264,6 +264,12 @@
|
||||
<property name="linker.cfg.id" value="linker.cfg.linux.amd64" />
|
||||
</target>
|
||||
|
||||
+ <target name="declare.linux.aarch64" if="isLinuxARM64">
|
||||
+ <echo message="Linux.AArch64" />
|
||||
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64" />
|
||||
+ <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" />
|
||||
+ </target>
|
||||
+
|
||||
<target name="declare.linux.ia64" if="isLinuxIA64">
|
||||
<echo message="Linux.IA64" />
|
||||
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
|
||||
@@ -306,6 +312,18 @@
|
||||
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
|
||||
</target>
|
||||
|
||||
@@ -32,12 +30,6 @@ Index: gluegen-v2.3.2/make/build.xml
|
||||
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
|
||||
+ <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" />
|
||||
@@ -47,7 +39,7 @@ Index: gluegen-v2.3.2/make/build.xml
|
||||
</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,declare.linux.aarch64" if="isLinux" >
|
||||
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.aarch64,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>
|
||||
|
||||
@@ -55,13 +47,7 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.2.orig/make/gluegen-cpptasks-base.xml
|
||||
+++ gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
@@ -43,11 +43,14 @@
|
||||
- isLinuxARM64
|
||||
- isLinuxARMv6Armel (set in gluegen.cpptasks.detected.os.2)
|
||||
- isLinuxARMv6Armhf (set in gluegen.cpptasks.detected.os.2)
|
||||
+ - isLinuxAarch64
|
||||
- isLinuxAlpha
|
||||
- isLinuxHppa
|
||||
@@ -48,6 +48,8 @@
|
||||
- isLinuxMips
|
||||
- isLinuxMipsel
|
||||
- isLinuxPpc
|
||||
@@ -70,7 +56,7 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
- isLinuxs390
|
||||
- isLinuxs390x
|
||||
- isLinuxSparc
|
||||
@@ -133,6 +136,8 @@
|
||||
@@ -133,6 +135,8 @@
|
||||
- compiler.cfg.linux.mips
|
||||
- compiler.cfg.linux.mipsel
|
||||
- compiler.cfg.linux.ppc
|
||||
@@ -79,7 +65,7 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
- compiler.cfg.linux.s390
|
||||
- compiler.cfg.linux.s390x
|
||||
- compiler.cfg.linux.sparc
|
||||
@@ -417,6 +422,33 @@
|
||||
@@ -417,6 +421,24 @@
|
||||
<condition property="ppc">
|
||||
<os arch="ppc" />
|
||||
</condition>
|
||||
@@ -100,30 +86,30 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
+ </condition>
|
||||
+ <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}" />
|
||||
@@ -601,6 +633,9 @@
|
||||
@@ -457,6 +479,9 @@
|
||||
<istrue value="${isAMD64}" />
|
||||
</and>
|
||||
</condition>
|
||||
+ <condition property="isAArch64">
|
||||
+ <os arch="aarch64" />
|
||||
+ </condition>
|
||||
<condition property="isLinuxIA64">
|
||||
<and>
|
||||
<istrue value="${isLinux}" />
|
||||
@@ -601,6 +626,8 @@
|
||||
<echo message="LinuxMips=${isLinuxMips}" />
|
||||
<echo message="LinuxMipsel=${isLinuxMipsel}" />
|
||||
<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}" />
|
||||
@@ -683,6 +718,14 @@
|
||||
@@ -683,6 +710,14 @@
|
||||
<property name="os.and.arch" value="linux-ppc" />
|
||||
</target>
|
||||
|
||||
@@ -138,16 +124,16 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
<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 +750,7 @@
|
||||
@@ -707,7 +742,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.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.android.armv6.armhf,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.aarch64,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 +1311,15 @@
|
||||
@@ -1258,6 +1293,12 @@
|
||||
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
|
||||
</linker>
|
||||
|
||||
@@ -156,14 +142,20 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
+
|
||||
+ <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
|
||||
+ </linker>
|
||||
+
|
||||
+ <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
|
||||
+ </linker>
|
||||
+
|
||||
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
|
||||
</linker>
|
||||
|
||||
@@ -1505,6 +1557,20 @@
|
||||
@@ -1441,7 +1482,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">
|
||||
@@ -1479,6 +1520,20 @@
|
||||
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
|
||||
</target>
|
||||
|
||||
@@ -184,12 +176,12 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
<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 +1592,7 @@
|
||||
@@ -1500,7 +1555,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">
|
||||
+ <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.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.aarch64,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>
|
||||
|
1262
gluegen2-0008-jcpp-remove-javax-api.patch
Normal file
1262
gluegen2-0008-jcpp-remove-javax-api.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,62 +0,0 @@
|
||||
Index: gluegen-v2.3.1/make/gluegen-cpptasks.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.1.orig/make/gluegen-cpptasks.xml
|
||||
+++ gluegen-v2.3.1/make/gluegen-cpptasks.xml
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<!-- import cpptasks -->
|
||||
<!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/-->
|
||||
- <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
|
||||
+ <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="/usr/share/java/cpptasks.jar"/>
|
||||
|
||||
<!-- 0 fetch environment variable GLUEGEN_CPPTASKS_FILE -> gluegen-cpptasks.file -->
|
||||
<property environment="env" />
|
||||
Index: gluegen-v2.3.1/make/gluegen-properties.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.1.orig/make/gluegen-properties.xml
|
||||
+++ gluegen-v2.3.1/make/gluegen-properties.xml
|
||||
@@ -50,12 +50,12 @@
|
||||
<property file="${gluegen.user.properties.file.set}" />
|
||||
<echo message="Loaded ${gluegen.user.properties.file.set}." />
|
||||
<echo message="Setting defaults:" />
|
||||
- <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
|
||||
- <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
|
||||
- <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
|
||||
- <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
|
||||
- <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" />
|
||||
- <property name="semver.jar" value="${gluegen.root}/make/lib/semantic-versioning/semver.jar" />
|
||||
+ <property name="antlr.jar" value="/usr/share/java/antlr.jar" />
|
||||
+ <property name="junit.jar" value="/usr/share/java/junit4.jar" />
|
||||
+ <property name="ant.jar" value="/usr/share/java/ant.jar" />
|
||||
+ <property name="ant-junit.jar" value="/usr/share/java/ant/ant-junit.jar" />
|
||||
+ <property name="ant-junit4.jar" value="/usr/share/java/ant/ant-junit4.jar" />
|
||||
+ <property name="semver.jar" value="/usr/share/java/semantic-versioning/semver.jar" />
|
||||
|
||||
<property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
|
||||
<property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
|
||||
Index: gluegen-v2.3.1/make/jogamp-androidtasks.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.1.orig/make/jogamp-androidtasks.xml
|
||||
+++ gluegen-v2.3.1/make/jogamp-androidtasks.xml
|
||||
@@ -3,7 +3,7 @@
|
||||
<dirname property="jogamp-androidtasks.basedir" file="${ant.file.jogamp-androidtasks}"/>
|
||||
<taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||
<classpath>
|
||||
- <pathelement location="${jogamp-androidtasks.basedir}/lib/ant-contrib-1.0b3.jar"/>
|
||||
+ <pathelement location="/usr/share/java/ant-contrib.jar"/>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
|
||||
Index: gluegen-v2.3.1/make/jogamp-archivetasks.xml
|
||||
===================================================================
|
||||
--- gluegen-v2.3.1.orig/make/jogamp-archivetasks.xml
|
||||
+++ gluegen-v2.3.1/make/jogamp-archivetasks.xml
|
||||
@@ -3,7 +3,7 @@
|
||||
<dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/>
|
||||
<taskdef resource="net/sf/antcontrib/antlib.xml">
|
||||
<classpath>
|
||||
- <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/>
|
||||
+ <pathelement location="/usr/share/java/ant-contrib.jar"/>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
|
@@ -118,7 +118,7 @@
|
||||
+ <condition property="java.lib.dir.platform" value="${java.home.dir}/lib">
|
||||
+ <available file="${java.home.dir}/lib/libjawt.so"/>
|
||||
+ </condition>
|
||||
<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>
|
||||
|
||||
@@ -1513,6 +1532,9 @@
|
||||
|
11
gluegen2-notimestamp.patch
Normal file
11
gluegen2-notimestamp.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- gluegen-v2.3.2/src/java/com/jogamp/gluegen/CodeGenUtils.java 2025-07-17 08:17:37.631827626 +0200
|
||||
+++ gluegen-v2.3.2/src/java/com/jogamp/gluegen/CodeGenUtils.java 2025-07-17 08:17:46.384507694 +0200
|
||||
@@ -64,8 +64,6 @@
|
||||
w.print(packageAsPath(generator.getClass().getName()));
|
||||
w.print(".java ");
|
||||
}
|
||||
- w.print("on ");
|
||||
- w.print((new Date()).toString());
|
||||
w.println(" ----! */");
|
||||
w.println();
|
||||
}
|
@@ -6,14 +6,14 @@ Index: gluegen-v2.3.2/make/build.xml
|
||||
<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,declare.linux.aarch64" if="isLinux" >
|
||||
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.aarch64,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.riscv64" if="isLinuxRiscV64">
|
||||
+ <echo message="Linux.riscv64" />
|
||||
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
|
||||
+ <property name="linker.cfg.id" value="linker.cfg.linux.riscv64" />
|
||||
+ </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,declare.linux.aarch64,declare.linux.riscv64" if="isLinux" >
|
||||
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.aarch64,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,declare.linux.riscv64" if="isLinux" >
|
||||
<property name="c.src.dir.os" value="unix" />
|
||||
</target>
|
||||
|
||||
@@ -84,8 +84,8 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
<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.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,gluegen.cpptasks.detect.os.linux.riscv64" 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.android.armv6.armhf,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.aarch64,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.android.armv6.armhf,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.aarch64,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc,gluegen.cpptasks.detect.os.linux.riscv64" 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" />
|
||||
@@ -103,7 +103,7 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
<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.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.aarch64,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.riscv64" if="isLinuxRiscV64">
|
||||
+ <echo message="Linux.RiscV64" />
|
||||
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
|
||||
@@ -114,7 +114,7 @@ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
||||
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/riscv64" />
|
||||
+ </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,gluegen.cpptasks.declare.compiler.linux.riscv64" 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.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.aarch64,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc,gluegen.cpptasks.declare.compiler.linux.riscv64" if="isLinux">
|
||||
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
|
||||
</target>
|
||||
|
||||
|
@@ -1,7 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 21 10:01:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* gluegen2-notimestamp.patch
|
||||
+ for reproducible builds, do not add timestamps to generated
|
||||
files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 09:06:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use %autopatch instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 09:05:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 27 08:01:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Remove dependency on findbugs
|
||||
- Modified patches:
|
||||
* gluegen2-jdk9.patch
|
||||
* gluegen2-riscv64.patch
|
||||
+ rediff to changed context
|
||||
* gluegen2-jar-paths.patch
|
||||
-> gluegen2-0005-use-system-antlib.patch
|
||||
* gluegen2-add-ppc64-aarch64.patch
|
||||
-> gluegen2-0007-add-ppc64-aarch64.patch
|
||||
* gluegen2-no-static-libstdc++.patch
|
||||
-> gluegen2-0006-disable-static-libgcc.patch
|
||||
+ rediff and rename
|
||||
- Added patch:
|
||||
* gluegen2-0008-jcpp-remove-javax-api.patch
|
||||
+ remove code quality annotations not necessary for our build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 6 20:59:05 UTC 2022 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- gluegen2-riscv64: Add support for riscv64
|
||||
- Added patch:
|
||||
* gluegen2-riscv64.patch
|
||||
+ Add support for riscv64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 17 08:03:01 UTC 2018 - fstrba@suse.com
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gluegen2
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -26,27 +26,25 @@ Release: 0
|
||||
Summary: Tool for automatic generation the Java and JNI code
|
||||
License: BSD-2-Clause
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://jogamp.org/gluegen/www/
|
||||
URL: https://jogamp.org/gluegen/www/
|
||||
Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.xz
|
||||
Source1: http://jogamp.org/deployment/v%{version}/archive/Sources/%{jcppsrc_name}.tar.xz
|
||||
Patch0: gluegen2-jar-paths.patch
|
||||
Patch1: gluegen2-0001-renamed-library.patch
|
||||
Patch2: gluegen2-0003-disable-executable-tmp-tests.patch
|
||||
Patch3: gluegen2-0004-add-antlr-jar-to-all-targets.patch
|
||||
# FIXME: Disable all junit tests because it requires packages not yet packaged in obs
|
||||
# PATCH-FIX-OPENSUSE gluegen2-disable-tests.patch badshah400@gmail.com -- Remove junit tests from the "all" targets as this requires additional dependencies (jardiff)
|
||||
Patch5: gluegen2-disable-tests.patch
|
||||
Patch6: gluegen2-add-ppc64-aarch64.patch
|
||||
# PATCH-FIX-UPSTREAM gluegen2-no-static-libstdc++.patch badshah400@gmail.com -- Do not use -static-libstdc++ option for linker, causes build failures
|
||||
Patch7: gluegen2-no-static-libstdc++.patch
|
||||
Patch0: gluegen2-0001-renamed-library.patch
|
||||
Patch1: gluegen2-0003-disable-executable-tmp-tests.patch
|
||||
Patch2: gluegen2-0004-add-antlr-jar-to-all-targets.patch
|
||||
Patch3: gluegen2-0005-use-system-antlib.patch
|
||||
Patch4: gluegen2-0006-disable-static-libgcc.patch
|
||||
Patch5: gluegen2-0007-add-ppc64-aarch64.patch
|
||||
Patch6: gluegen2-0008-jcpp-remove-javax-api.patch
|
||||
Patch7: gluegen2-disable-tests.patch
|
||||
Patch8: gluegen2-0001-Remove-version-overrides-for-memcpy.patch
|
||||
Patch9: gluegen2-jdk9.patch
|
||||
Patch10: gluegen2-jdk10.patch
|
||||
Patch11: gluegen2-riscv64.patch
|
||||
Patch12: gluegen2-notimestamp.patch
|
||||
BuildRequires: ant >= 1.9.8
|
||||
BuildRequires: ant-antlr
|
||||
BuildRequires: ant-contrib
|
||||
BuildRequires: ant-findbugs
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: cpptasks
|
||||
BuildRequires: java-devel >= 1.8
|
||||
@@ -84,17 +82,7 @@ This package contains gluegen source code needed to build packages.
|
||||
cp -pr ../%{jcppsrc_name}/src ./jcpp/
|
||||
rm -rf src/java/net/highteq/nativetaglet/
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%autopatch -p1
|
||||
|
||||
# Fix wrong-script-end-of-line-encoding
|
||||
rm make/scripts/*.bat
|
||||
@@ -140,8 +128,12 @@ sed -i 's/executable="mvn"/executable="true"/' make/build.xml
|
||||
%build
|
||||
cd make
|
||||
ant -Djava.version=1.8 -Dant.java.version=1.8 \
|
||||
-Djavacdebug=true \
|
||||
-Djavacdebug=false \
|
||||
-Djavacdebuglevel=lines,vars,source \
|
||||
-Dantlr.jar=$(find-jar antlr) \
|
||||
-Djunit.jar=$(find-jar junit) \
|
||||
-Dant.jar=$(find-jar ant) \
|
||||
-Dant-junit.jar=$(find-jar ant/ant-junit) \
|
||||
-Dc.compiler.debug=true \
|
||||
all
|
||||
|
||||
@@ -167,13 +159,13 @@ chmod -x %{buildroot}%{_datadir}/%{name}/make/Manifest*
|
||||
chmod -x %{buildroot}%{_datadir}/%{name}/make/gluegen.properties
|
||||
|
||||
%files
|
||||
%doc LICENSE.txt
|
||||
%license LICENSE.txt
|
||||
%{_javadir}/%{name}-rt.jar
|
||||
%{_jnidir}/%{name}-rt-natives.jar
|
||||
%{_libdir}/lib%{name}-rt.so
|
||||
|
||||
%files devel
|
||||
%doc LICENSE.txt
|
||||
%license LICENSE.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{gluegen_devel_dir}/
|
||||
|
||||
|
Reference in New Issue
Block a user