[gluegen2] 02/04: Revert one useless hunk of patch ppc64el-support.diff.
Gilles Filippini
pini at debian.org
Thu Oct 29 18:26:28 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 c4dbc48f4d19b518566dd57d97d75df39bf68d22
Author: Gilles Filippini <pini at debian.org>
Date: Thu Oct 29 13:40:21 2015 +0100
Revert one useless hunk of patch ppc64el-support.diff.
---
debian/patches/ppc64el-support.diff | 13 -------------
debian/patches/s390x-support.diff | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/debian/patches/ppc64el-support.diff b/debian/patches/ppc64el-support.diff
index 1df83ec..7f1af3c 100644
--- a/debian/patches/ppc64el-support.diff
+++ b/debian/patches/ppc64el-support.diff
@@ -179,19 +179,6 @@ Index: gluegen2/src/java/jogamp/common/os/PlatformPropsImpl.java
break;
case MIPS_64:
_and_arch_tmp = "mips64";
-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
-@@ -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#X86_64} Windows */
- X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
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 8ca3736..8ec4b27 100644
--- a/debian/patches/s390x-support.diff
+++ b/debian/patches/s390x-support.diff
@@ -122,7 +122,7 @@ Index: gluegen2/src/java/com/jogamp/common/os/MachineDataInfo.java
/**
@@ -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, 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),
--
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