Author: sylvestre
Date: 2012-03-12 19:22:50 +0000 (Mon, 12 Mar 2012)
New Revision: 15853
Added:
trunk/gluegen2/debian/patches/s390x.diff
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/patches/series
Log:
Fix the build issue under s390x
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2012-03-12 19:20:50 UTC (rev 15852)
+++ trunk/gluegen2/debian/changelog 2012-03-12 19:22:50 UTC (rev 15853)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc5-1~exp2) experimental; urgency=low
+
+ * Fix the build issue under s390x
+
+ -- Sylvestre Ledru <sylves...@debian.org> Mon, 26 Dec 2011 09:27:15 +0100
+
gluegen2 (2.0-rc5-1~exp1) experimental; urgency=low
* New upstream release
Added: trunk/gluegen2/debian/patches/s390x.diff
===================================================================
--- trunk/gluegen2/debian/patches/s390x.diff (rev 0)
+++ trunk/gluegen2/debian/patches/s390x.diff 2012-03-12 19:22:50 UTC (rev
15853)
@@ -0,0 +1,130 @@
+diff --git a/make/build.xml b/make/build.xml
+index bc04423..87678bc 100644
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -343,13 +343,19 @@
+ <property name="linker.cfg.id"
value="linker.cfg.linux.s390" />
+ </target>
+
++ <target name="declare.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.s390x" />
++ <property name="compiler.cfg.id"
value="compiler.cfg.linux" />
++ <property name="linker.cfg.id"
value="linker.cfg.linux.s390x" />
++ </target>
++
+ <target name="declare.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.sparc" />
+ <property name="compiler.cfg.id"
value="compiler.cfg.linux" />
+ <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.sparc,declare.linux.armv7"
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.armv7"
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/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
+index 92aab28..f0ea963 100755
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -36,6 +36,7 @@
+ - isLinuxMipsel
+ - isLinuxPpc
+ - isLinuxs390
++ - isLinuxs390x
+ - isLinuxSparc
+ - isOSX
+ - isOSXPPC
+@@ -117,6 +118,7 @@
+ - compiler.cfg.linux.mipsel
+ - compiler.cfg.linux.ppc
+ - compiler.cfg.linux.s390
++ - compiler.cfg.linux.s390x
+ - compiler.cfg.linux.sparc
+ - compiler.cfg.solaris
+ - compiler.cfg.solaris.sparcv9
+@@ -137,6 +139,7 @@
+ - linker.cfg.linux.mipsel
+ - linker.cfg.linux.ppc
+ - linker.cfg.linux.s390
++ - linker.cfg.linux.s390x
+ - linker.cfg.linux.sparc
+ - linker.cfg.freebsd.x86
+ - linker.cfg.freebsd.amd64
+@@ -340,6 +343,15 @@
+ <condition property="s390">
+ <os arch="s390" />
+ </condition>
++ <condition property="isLinuxs390x">
++ <and>
++ <istrue value="${isLinux}" />
++ <os arch="s390x" />
++ </and>
++ </condition>
++ <condition property="s390x">
++ <os arch="s390x" />
++ </condition>
+ <condition property="isLinuxSparc">
+ <and>
+ <istrue value="${isLinux}" />
+@@ -478,6 +490,7 @@
+ <echo message="LinuxMipsel=${isLinuxMipsel}" />
+ <echo message="LinuxPpc=${isLinuxPpc}" />
+ <echo message="Linuxs390=${isLinuxs390}" />
++ <echo message="Linuxs390x=${isLinuxs390x}" />
+ <echo message="LinuxSparc=${isLinuxSparc}" />
+ <echo message="OS X=${isOSX}" />
+ <echo message="OS X PPC=${use.macosppc}" />
+@@ -552,6 +565,10 @@
+ <property name="os.and.arch" value="linux-s390" />
+ </target>
+
++ <target name="gluegen.cpptasks.detect.os.linux.s390x"
unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390x">
++ <property name="os.and.arch" value="linux-s390x" />
++ </target>
++
+ <target name="gluegen.cpptasks.detect.os.linux.sparc"
unless="gluegen.cpptasks.detected.os.2" if="isLinuxSparc">
+ <property name="os.and.arch" value="linux-sparc" />
+ </target>
+@@ -561,7 +578,7 @@
+ <property name="os.and.arch" value="android-armv7" />
+ </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.armv7,gluegen.cpptasks.detect.os.android.armv7,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.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.armv7,gluegen.cpptasks.detect.os.android.armv7,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.osx"
unless="gluegen.cpptasks.detected.os.2" if="isOSX">
+ <property name="native.library.suffix" value="*lib" />
+@@ -1036,6 +1053,9 @@
+ <linker id="linker.cfg.linux.s390" name="gcc">
+ </linker>
+
++ <linker id="linker.cfg.linux.s390x" name="gcc">
++ </linker>
++
+ <linker id="linker.cfg.linux.sparc" name="gcc">
+ </linker>
+
+@@ -1244,6 +1264,13 @@
+ <property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/s390" />
+ </target>
+
++ <target name="gluegen.cpptasks.declare.compiler.linux.s390x"
if="isLinuxs390x">
++ <echo message="Linux.s390x" />
++ <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/s390x" />
++ </target>
++
+ <target name="gluegen.cpptasks.declare.compiler.linux.sparc"
if="isLinuxSparc">
+ <echo message="Linux.Sparc" />
+ <property name="compiler.cfg.id.base"
value="compiler.cfg.linux" />
+@@ -1251,7 +1278,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.armv7,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.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.armv7,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">
+ <property name="java.includes.dir.platform"
value="${java.includes.dir}/linux" />
+ </target>
+
Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series 2012-03-12 19:20:50 UTC (rev
15852)
+++ trunk/gluegen2/debian/patches/series 2012-03-12 19:22:50 UTC (rev
15853)
@@ -11,3 +11,4 @@
hideException.diff
TARGET_JAVA_LIBS_disabled.diff
+s390x.diff
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
