Hello community,
here is the log from the commit of package gluegen2 for openSUSE:Factory
checked in at 2014-06-24 15:15:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gluegen2 (Old)
and /work/SRC/openSUSE:Factory/.gluegen2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gluegen2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gluegen2/gluegen2.changes 2014-05-06
17:40:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gluegen2.new/gluegen2.changes 2014-06-24
15:16:02.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 19 14:58:20 UTC 2014 - dval...@suse.com
+
+- Fix builds for ppc64, ppc64le and aarch64 architectures
+ (gluegen2-ppc64-aarch64.patch)
+
+-------------------------------------------------------------------
New:
----
gluegen2-ppc64-aarch64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gluegen2.spec ++++++
--- /var/tmp/diff_new_pack.utrzZ3/_old 2014-06-24 15:16:03.000000000 +0200
+++ /var/tmp/diff_new_pack.utrzZ3/_new 2014-06-24 15:16:03.000000000 +0200
@@ -32,6 +32,7 @@
Patch1: gluegen2-0001-renamed-library.patch
Patch2: gluegen2-0003-disable-executable-tmp-tests.patch
Patch3: gluegen2-0004-add-antlr-jar-to-all-targets.patch
+Patch4: gluegen2-ppc64-aarch64.patch
BuildRequires: ant
BuildRequires: ant-antlr
@@ -88,6 +89,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# Remove any JNI files
# rm -fr make/stub_includes/jni
++++++ gluegen2-ppc64-aarch64.patch ++++++
Index: gluegen-v2.0.2/make/build.xml
===================================================================
--- gluegen-v2.0.2.orig/make/build.xml
+++ gluegen-v2.0.2/make/build.xml
@@ -333,6 +333,24 @@
<property name="linker.cfg.id"
value="linker.cfg.linux.ppc" />
</target>
+ <target name="declare.linux.ppc64" if="isLinuxPpc64">
+ <echo message="Linux.ppc64" />
+ <property name="compiler.cfg.id"
value="compiler.cfg.linux" />
+ <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" />
@@ -351,7 +369,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.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"
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.0.2/make/gluegen-cpptasks-base.xml
===================================================================
--- gluegen-v2.0.2.orig/make/gluegen-cpptasks-base.xml
+++ gluegen-v2.0.2/make/gluegen-cpptasks-base.xml
@@ -46,6 +46,9 @@
- isLinuxMips
- isLinuxMipsel
- isLinuxPpc
+ - isLinuxPpc64
+ - isLinuxPpc64le
+ - isLinuxAarch64
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
@@ -128,6 +131,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
@@ -385,6 +391,33 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
+ <condition property="isLinuxPpc64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc64" />
+ </and>
+ </condition>
+ <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}" />
@@ -567,6 +600,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}" />
@@ -643,6 +679,18 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
+ <target name="gluegen.cpptasks.detect.os.linux.ppc64"
unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64">
+ <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>
@@ -663,7 +711,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.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" />
@@ -1164,6 +1212,15 @@
<linker id="linker.cfg.linux.ppc" name="gcc">
</linker>
+ <linker id="linker.cfg.linux.ppc64" name="gcc">
+ </linker>
+
+ <linker id="linker.cfg.linux.ppc64le" name="gcc">
+ </linker>
+
+ <linker id="linker.cfg.linux.aarch64" name="gcc">
+ </linker>
+
<linker id="linker.cfg.linux.s390" name="gcc">
</linker>
@@ -1386,6 +1443,27 @@
<property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/ppc" />
</target>
+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64"
if="isLinuxPpc64">
+ <echo message="Linux.Ppc64" />
+ <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/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" />
@@ -1407,7 +1485,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.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>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
