[gluegen2] 01/02: New patch s390x-support.diff.
Gilles Filippini
pini at debian.org
Tue Oct 27 21:13:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository gluegen2.
commit 219f67b31f643fb04fceb121d0a98c9012f60639
Author: Gilles Filippini <pini at zelenka.debian.org>
Date: Tue Oct 27 09:50:54 2015 +0000
New patch s390x-support.diff.
---
debian/changelog | 7 ++
debian/patches/s390x-support.diff | 150 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 158 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8479fbf..1e894dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gluegen2 (2.3.2-3~exp1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New patch s390x-support.diff: tentative to add support for s390x.
+
+ -- Gilles Filippini <pini at debian.org> Mon, 26 Oct 2015 23:12:10 +0000
+
gluegen2 (2.3.2-2) experimental; urgency=medium
* Team upload.
diff --git a/debian/patches/s390x-support.diff b/debian/patches/s390x-support.diff
new file mode 100644
index 0000000..494ce70
--- /dev/null
+++ b/debian/patches/s390x-support.diff
@@ -0,0 +1,150 @@
+Index: gluegen2/make/scripts/make.gluegen.all.linux-s390x.sh
+===================================================================
+--- /dev/null
++++ gluegen2/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
+Index: gluegen2/src/java/jogamp/common/os/PlatformPropsImpl.java
+===================================================================
+--- gluegen2.orig/src/java/jogamp/common/os/PlatformPropsImpl.java
++++ gluegen2/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);
+ }
+Index: gluegen2/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
+===================================================================
+--- gluegen2.orig/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
++++ gluegen2/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;
+Index: gluegen2/src/java/com/jogamp/common/os/Platform.java
+===================================================================
+--- gluegen2.orig/src/java/com/jogamp/common/os/Platform.java
++++ gluegen2/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 + "')");
+ }
+Index: gluegen2/src/java/com/jogamp/common/os/MachineDataInfo.java
+===================================================================
+--- gluegen2.orig/src/java/com/jogamp/common/os/MachineDataInfo.java
++++ gluegen2/src/java/com/jogamp/common/os/MachineDataInfo.java
+@@ -74,6 +74,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 };
+
+ /**
+@@ -109,11 +110,13 @@ 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, .. */
+ 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#PPC64} Unix */
+ PPC_64_UNIX( size_ppc_64_unix, align_lp64_unix),
+ /** {@link Platform.CPUType#X86_64} Windows */
+ X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
+- // 8
++ // 10
+
+ public final MachineDataInfo md;
+
+Index: gluegen2/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+===================================================================
+--- gluegen2.orig/src/java/jogamp/common/os/MachineDataInfoRuntime.java
++++ gluegen2/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+@@ -114,6 +114,8 @@ public class MachineDataInfoRuntime {
+ return StaticConfig.X86_64_WINDOWS;
+ } else if ( Platform.CPUType.PPC64 == cpuType ) {
+ return StaticConfig.PPC_64_UNIX;
++ } 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;
diff --git a/debian/patches/series b/debian/patches/series
index f50284b..99fe81e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ missing-arch-symbol.diff
fix-arm64-build-config.diff
tests.diff
disable-static-linking.diff
+s390x-support.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git
More information about the pkg-java-commits
mailing list