[gluegen2] 05/06: Move patch ppc64el-support.diff to the bottom of the stack
Gilles Filippini
pini at debian.org
Sat Oct 10 22:42:12 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 3530ceef092167d1bc8cd2a3b96631bd1ff73da7
Author: Gilles Filippini <pini at debian.org>
Date: Sat Oct 10 02:32:38 2015 +0000
Move patch ppc64el-support.diff to the bottom of the stack
To ease pull requests with upstream.
---
debian/patches/armhf.diff | 24 ++++++++++++++----------
debian/patches/disableArchive7z.diff | 10 ++++++----
debian/patches/fix-alpha-build-config.patch | 12 +++++++-----
debian/patches/hideException.diff | 8 +++++---
debian/patches/linker.diff | 8 +++++---
debian/patches/ppc64el-support.diff | 14 +++++++-------
debian/patches/renamedLibrary.diff | 4 ++--
debian/patches/series | 2 +-
8 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/debian/patches/armhf.diff b/debian/patches/armhf.diff
index 459dcdb..81b02c7 100644
--- a/debian/patches/armhf.diff
+++ b/debian/patches/armhf.diff
@@ -1,5 +1,7 @@
---- a/make/build.xml
-+++ b/make/build.xml
+Index: gluegen2/make/build.xml
+===================================================================
+--- gluegen2.orig/make/build.xml
++++ gluegen2/make/build.xml
@@ -263,10 +263,16 @@
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
@@ -21,18 +23,20 @@
</target>
<target name="declare.linux.alpha" if="isLinuxAlpha">
-@@ -317,7 +323,7 @@
+@@ -329,7 +335,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.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.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" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
---- a/make/gluegen-cpptasks-base.xml
-+++ b/make/gluegen-cpptasks-base.xml
-@@ -1004,7 +1004,7 @@
+Index: gluegen2/make/gluegen-cpptasks-base.xml
+===================================================================
+--- gluegen2.orig/make/gluegen-cpptasks-base.xml
++++ gluegen2/make/gluegen-cpptasks-base.xml
+@@ -1037,7 +1037,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
@@ -41,7 +45,7 @@
<defineset>
<define name="__unix__"/>
<define name="__X11__" if="isX11"/>
-@@ -1239,7 +1239,7 @@
+@@ -1272,7 +1272,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
@@ -50,7 +54,7 @@
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
-@@ -1253,6 +1253,9 @@
+@@ -1286,6 +1286,9 @@
<linkerarg value="-static-libgcc" if="isGCC"/>
</linker>
diff --git a/debian/patches/disableArchive7z.diff b/debian/patches/disableArchive7z.diff
index ed39731..0e9700e 100644
--- a/debian/patches/disableArchive7z.diff
+++ b/debian/patches/disableArchive7z.diff
@@ -1,6 +1,8 @@
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -1055,9 +1055,9 @@
+Index: gluegen2/make/build.xml
+===================================================================
+--- gluegen2.orig/make/build.xml
++++ gluegen2/make/build.xml
+@@ -1067,9 +1067,9 @@
<copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
<fileset dir="doc/javadoc/resources" includes="*" />
</copy>
@@ -12,7 +14,7 @@
</target>
<!-- ================================================================== -->
-@@ -1096,9 +1096,9 @@
+@@ -1108,9 +1108,9 @@
<fileset dir="${project.root}/jnlp-files" includes="*" />
</copy>
<copy todir="${archive}" file="${build}/gluegen-java-src.zip"/>
diff --git a/debian/patches/fix-alpha-build-config.patch b/debian/patches/fix-alpha-build-config.patch
index de66104..20d56f4 100644
--- a/debian/patches/fix-alpha-build-config.patch
+++ b/debian/patches/fix-alpha-build-config.patch
@@ -1,11 +1,13 @@
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -323,7 +323,7 @@
+Index: gluegen2/make/build.xml
+===================================================================
+--- gluegen2.orig/make/build.xml
++++ gluegen2/make/build.xml
+@@ -335,7 +335,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.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.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.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" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
diff --git a/debian/patches/hideException.diff b/debian/patches/hideException.diff
index 34fa9fd..4ef5e7f 100644
--- a/debian/patches/hideException.diff
+++ b/debian/patches/hideException.diff
@@ -1,6 +1,8 @@
---- a/src/java/com/jogamp/common/os/Platform.java
-+++ b/src/java/com/jogamp/common/os/Platform.java
-@@ -305,15 +305,6 @@
+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
+@@ -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);
diff --git a/debian/patches/linker.diff b/debian/patches/linker.diff
index 5fef3b3..91c69f0 100644
--- a/debian/patches/linker.diff
+++ b/debian/patches/linker.diff
@@ -1,6 +1,8 @@
---- a/make/gluegen-cpptasks-base.xml
-+++ b/make/gluegen-cpptasks-base.xml
-@@ -1277,6 +1277,8 @@
+Index: gluegen2/make/gluegen-cpptasks-base.xml
+===================================================================
+--- gluegen2.orig/make/gluegen-cpptasks-base.xml
++++ gluegen2/make/gluegen-cpptasks-base.xml
+@@ -1316,6 +1316,8 @@
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
</linker>
diff --git a/debian/patches/ppc64el-support.diff b/debian/patches/ppc64el-support.diff
index 3b5140c..8032bc4 100644
--- a/debian/patches/ppc64el-support.diff
+++ b/debian/patches/ppc64el-support.diff
@@ -115,7 +115,7 @@ Index: gluegen2/make/gluegen-cpptasks-base.xml
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
-@@ -1271,6 +1304,12 @@
+@@ -1268,6 +1301,12 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
@@ -128,7 +128,7 @@ Index: gluegen2/make/gluegen-cpptasks-base.xml
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
</linker>
-@@ -1502,6 +1541,20 @@
+@@ -1497,6 +1536,20 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
@@ -149,7 +149,7 @@ Index: gluegen2/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" />
-@@ -1523,7 +1576,7 @@
+@@ -1518,7 +1571,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
@@ -229,7 +229,7 @@ Index: gluegen2/make/build.xml
===================================================================
--- gluegen2.orig/make/build.xml
+++ gluegen2/make/build.xml
-@@ -305,6 +305,18 @@
+@@ -307,6 +307,18 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
@@ -248,12 +248,12 @@ Index: gluegen2/make/build.xml
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -323,7 +335,7 @@
+@@ -325,7 +337,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.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" >
+- <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" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
diff --git a/debian/patches/renamedLibrary.diff b/debian/patches/renamedLibrary.diff
index 1bec7c6..bcd174b 100644
--- a/debian/patches/renamedLibrary.diff
+++ b/debian/patches/renamedLibrary.diff
@@ -48,7 +48,7 @@ Index: gluegen2/make/build.xml
===================================================================
--- gluegen2.orig/make/build.xml
+++ gluegen2/make/build.xml
-@@ -413,7 +413,7 @@
+@@ -425,7 +425,7 @@
<property name="c.compiler.src.files.common" value="src/native/common/*.c" />
<property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
@@ -57,7 +57,7 @@ Index: gluegen2/make/build.xml
<condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
<condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
<condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
-@@ -490,13 +490,13 @@
+@@ -502,13 +502,13 @@
<antcall target="c.manifest" inheritRefs="true" />
<native.tag.jar objdir="${build}/obj"
diff --git a/debian/patches/series b/debian/patches/series
index 2f40232..237d982 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ppc64el-support.diff
jarPath.diff
renamedLibrary.diff
disableArchive7z.diff
@@ -19,6 +20,5 @@ fix-alpha-build-config.patch
missing-arch-symbol.diff
#add-mips-support.patch
-ppc64el-support.diff
fix-arm64-build-config.diff
tests.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