[gluegen2] 02/02: Revert pagesize strict check introduced by patch ppc64el-support.diff
Gilles Filippini
pini at debian.org
Thu Oct 29 12:11:44 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 7c327f4579320bfa893bb8da597ec80b7e681ab8
Author: Gilles Filippini <pini at debian.org>
Date: Wed Oct 28 14:22:26 2015 +0100
Revert pagesize strict check introduced by patch ppc64el-support.diff
As said by upstream:
<<
the PAGESIZE is different and the static (assumed) may not match the
queried one at runtime, but AFAIK we prefer the runtime one .. no?
>>
This renders patch powerpc-support.diff useless BTW.
---
debian/changelog | 9 +++++----
debian/patches/powerpc-support.diff | 16 ----------------
debian/patches/ppc64el-support.diff | 35 +----------------------------------
debian/patches/s390x-support.diff | 14 ++++++--------
debian/patches/series | 1 -
5 files changed, 12 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d07b90..08a872d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-gluegen2 (2.3.2-3~exp3) experimental; urgency=medium
+gluegen2 (2.3.2-3~exp4) experimental; urgency=medium
* Team upload.
- * New patches:
- - s390x-support.diff: add support for s390x
- - powerpc-support.diff: fix pagesize support for powerpc.
+ * New patch s390x-support.diff: add support for s390x.
+ * Simplify patch ppc64el-support.diff: the preferred pagesize is
+ the runtime one, then no need to define the size_ppc_64_unix
+ record where only the pagesize is different from size_lp64_unix.
* d/rules: drop useless DEB_ANT_BUILD_TARGET override which
disabled test cases build for armhf.
diff --git a/debian/patches/powerpc-support.diff b/debian/patches/powerpc-support.diff
deleted file mode 100644
index 5470880..0000000
--- a/debian/patches/powerpc-support.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: on Debian powerpc porter boxes, 'getconf PAGESIZE'
- returns 65536. This patch fixes many testcase failures.
-Author: Gilles Filippini <pini at debian.org>
-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
-@@ -59,7 +59,7 @@ public class MachineDataInfo {
- private final static int[] size_arm_mips_32 = { 4, 4, 4, 8, 8, 4, 4096 };
- private final static int[] size_x86_32_unix = { 4, 4, 4, 8, 12, 4, 4096 };
- private final static int[] size_x86_32_macos = { 4, 4, 4, 8, 16, 4, 4096 };
-- private final static int[] size_ppc_32_unix = { 4, 4, 4, 8, 16, 4, 4096 };
-+ private final static int[] size_ppc_32_unix = { 4, 4, 4, 8, 16, 4, 65536 };
- private final static int[] size_sparc_32_sunos = { 4, 4, 4, 8, 16, 4, 8192 };
- private final static int[] size_x86_32_windows = { 4, 4, 4, 8, 12, 4, 4096 };
- private final static int[] size_lp64_unix = { 4, 8, 4, 8, 16, 8, 4096 };
diff --git a/debian/patches/ppc64el-support.diff b/debian/patches/ppc64el-support.diff
index 8629e7f..1df83ec 100644
--- a/debian/patches/ppc64el-support.diff
+++ b/debian/patches/ppc64el-support.diff
@@ -183,48 +183,15 @@ 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
-@@ -63,6 +63,7 @@ public class MachineDataInfo {
- private final static int[] size_sparc_32_sunos = { 4, 4, 4, 8, 16, 4, 8192 };
- private final static int[] size_x86_32_windows = { 4, 4, 4, 8, 12, 4, 4096 };
- private final static int[] size_lp64_unix = { 4, 8, 4, 8, 16, 8, 4096 };
-+ private final static int[] size_ppc_64_unix = { 4, 8, 4, 8, 16, 8, 65536 };
- private final static int[] size_x86_64_windows = { 4, 4, 4, 8, 16, 8, 4096 };
-
- /* arch os i8, i16, i32, i64, int, long, float, doubl, ldoubl, ptr */
-@@ -106,8 +107,10 @@ public class MachineDataInfo {
+@@ -106,7 +106,7 @@ public class MachineDataInfo {
SPARC_32_SUNOS( size_sparc_32_sunos, align_sparc_32_sunos),
/** {@link Platform.CPUType#X86_32} Windows */
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, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, .. */
LP64_UNIX( size_lp64_unix, align_lp64_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
-@@ -332,7 +335,7 @@ public class MachineDataInfo {
- doubleSizeInBytes == md.doubleSizeInBytes &&
- ldoubleSizeInBytes == md.ldoubleSizeInBytes &&
- pointerSizeInBytes == md.pointerSizeInBytes &&
--
-+ pageSizeInBytes == md.pageSizeInBytes &&
- int8AlignmentInBytes == md.int8AlignmentInBytes &&
- int16AlignmentInBytes == md.int16AlignmentInBytes &&
- int32AlignmentInBytes == md.int32AlignmentInBytes &&
-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
-@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
- } else {
- if( osType == Platform.OSType.WINDOWS ) {
- return StaticConfig.X86_64_WINDOWS;
-+ } else if ( Platform.CPUType.PPC64 == cpuType ) {
-+ return StaticConfig.PPC_64_UNIX;
- } else {
- // for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
- return StaticConfig.LP64_UNIX;
Index: gluegen2/make/build.xml
===================================================================
--- gluegen2.orig/make/build.xml
diff --git a/debian/patches/s390x-support.diff b/debian/patches/s390x-support.diff
index 494ce70..8ca3736 100644
--- a/debian/patches/s390x-support.diff
+++ b/debian/patches/s390x-support.diff
@@ -112,7 +112,7 @@ 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 {
+@@ -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 };
@@ -120,18 +120,16 @@ Index: gluegen2/src/java/com/jogamp/common/os/MachineDataInfo.java
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 {
+@@ -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, .. */
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
++ // 9
public final MachineDataInfo md;
@@ -139,10 +137,10 @@ 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 {
+@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
+ } else {
+ if( osType == Platform.OSType.WINDOWS ) {
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 {
diff --git a/debian/patches/series b/debian/patches/series
index 21d4996..99fe81e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,4 +24,3 @@ fix-arm64-build-config.diff
tests.diff
disable-static-linking.diff
s390x-support.diff
-powerpc-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