[pkg-java] r17663 - trunk/gluegen2/debian/patches
Sylvestre Ledru
sylvestre at moszumanska.debian.org
Thu Jan 16 10:22:47 UTC 2014
Author: sylvestre
Date: 2014-01-16 10:22:47 +0000 (Thu, 16 Jan 2014)
New Revision: 17663
Modified:
trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
Log:
Fix patch
Modified: trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
===================================================================
--- trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2014-01-16 10:05:08 UTC (rev 17662)
+++ trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2014-01-16 10:22:47 UTC (rev 17663)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.2/make/build.xml
+Index: b/make/build.xml
===================================================================
---- gluegen-v2.1.2.orig/make/build.xml 2013-11-08 10:32:45.000000000 +0100
-+++ gluegen-v2.1.2/make/build.xml 2013-11-08 10:32:45.000000000 +0100
-@@ -331,6 +331,12 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -331,6 +331,24 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
@@ -12,39 +12,55 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" />
+ </target>
+
++ <target name="declare.linux.ppc64le" if="isLinuxPpc64le">
++ <echo message="Linux.ppc64le" />
++ <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" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -349,7 +355,7 @@
+@@ -349,7 +367,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.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.aarch64,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>
-Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml
+Index: b/make/gluegen-cpptasks-base.xml
===================================================================
---- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:32:45.000000000 +0100
-+++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:33:20.000000000 +0100
-@@ -46,6 +46,7 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -46,6 +46,9 @@
- isLinuxMips
- isLinuxMipsel
- isLinuxPpc
+ - isLinuxPpc64
++ - isLinuxPpc64le
++ - isLinuxAarch64
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
-@@ -130,6 +131,7 @@
+@@ -130,6 +133,9 @@
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
- compiler.cfg.linux.ppc
+ - compiler.cfg.linux.ppc64
++ - compiler.cfg.linux.ppc64le
++ - compiler.cfg.linux.aarch64
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
-@@ -388,6 +390,15 @@
+@@ -388,6 +394,33 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
@@ -57,18 +73,38 @@
+ <condition property="ppc64">
+ <os arch="ppc64" />
+ </condition>
++ <condition property="isLinuxPpc64le">
++ <and>
++ <istrue value="${isLinux}" />
++ <os arch="ppc64le" />
++ </and>
++ </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}" />
-@@ -570,6 +581,7 @@
+@@ -570,6 +603,9 @@
<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}" />
-@@ -646,6 +658,10 @@
+@@ -646,6 +682,18 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
@@ -76,29 +112,43 @@
+ <property name="os.and.arch" value="linux-ppc64" />
+ </target>
+
++ <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le">
++ <property name="os.and.arch" value="linux-ppc64le" />
++ </target>
++
++ <target name="gluegen.cpptasks.detect.os.linux.aarch64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAarch64">
++ <property name="os.and.arch" value="linux-aarch64" />
++ </target>
++
<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>
-@@ -666,7 +682,7 @@
+@@ -666,7 +714,7 @@
<property name="os.and.arch" value="android-armv6hf" />
</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.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.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.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" />
-@@ -1183,6 +1199,9 @@
+@@ -1183,6 +1231,15 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
+ <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}">
+ </linker>
+
++ <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>
-@@ -1407,6 +1426,13 @@
+@@ -1407,6 +1464,27 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
@@ -109,15 +159,29 @@
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" />
+ </target>
+
++ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le">
++ <echo message="Linux.Ppc64le" />
++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" />
++ </target>
++
++ <target name="gluegen.cpptasks.declare.compiler.linux.aarch64" if="isLinuxAarch64">
++ <echo message="Linux.Aarch64" />
++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" />
++ </target>
++
<target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
-@@ -1428,7 +1454,7 @@
+@@ -1428,7 +1506,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.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.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.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}/linux" />
</target>
More information about the pkg-java-commits
mailing list