Attachment 308 Details for Bug 488 – Fix bug 488

[patch] Fix bug 488

0002-Fix-bug-488-allow-the-Linux-build-of-gluegen2-on-way.patch (text/plain), 16.35 KB, created by Sylvestre Ledru on 2011-12-26 09:59:36 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvestre Ledru

Created: 2011-12-26 09:59:36 CET

Size: 16.35 KB

patch

obsolete

>From 18488440c73ae26d3e43ff4fc0fefd99ddc72cde Mon Sep 17 00:00:00 2001
>From: Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
>Date: Mon, 26 Dec 2011 09:26:15 +0100
>Subject: [PATCH 2/2] Fix bug #488: allow the Linux build of gluegen2 on way
> more Linux platforms
>
>---
> make/build.xml                 |   50 +++++++++-
> make/gluegen-cpptasks-base.xml |  227 +++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 273 insertions(+), 4 deletions(-)
>
>diff --git a/make/build.xml b/make/build.xml
>index a4aedbe..87678bc 100644
>--- a/make/build.xml
>+++ b/make/build.xml
>@@ -306,8 +306,56 @@
>       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7" /> 
>       <property name="linker.cfg.id"                        value="linker.cfg.linux.armv7" /> 
>     </target>
>+
>+    <target name="declare.linux.alpha" if="isLinuxAlpha">
>+      <echo message="Linux.alpha" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <property name="linker.cfg.id"                        value="linker.cfg.linux.alpha" /> 
>+    </target>
>+
>+    <target name="declare.linux.hppa" if="isLinuxHppa">
>+      <echo message="Linux.hppa" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <property name="linker.cfg.id"                        value="linker.cfg.linux.hppa" /> 
>+    </target>
>+
>+    <target name="declare.linux.mips" if="isLinuxMips">
>+      <echo message="Linux.mips" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <property name="linker.cfg.id"                        value="linker.cfg.linux.mips" /> 
>+    </target>
>+
>+    <target name="declare.linux.mipsel" if="isLinuxMipsel">
>+      <echo message="Linux.mipsel" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <property name="linker.cfg.id"                        value="linker.cfg.linux.mipsel" /> 
>+    </target>
>+
>+    <target name="declare.linux.ppc" if="isLinuxPpc">
>+      <echo message="Linux.ppc" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <property name="linker.cfg.id"                        value="linker.cfg.linux.ppc" /> 
>+    </target>
>+
>+    <target name="declare.linux.s390" if="isLinuxs390">
>+      <echo message="Linux.s390" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
>+      <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.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 cd573a3..f0ea963 100755
>--- a/make/gluegen-cpptasks-base.xml
>+++ b/make/gluegen-cpptasks-base.xml
>@@ -30,6 +30,14 @@
>    -   isLinuxIA64
>    -   isLinuxX86
>    -   isLinuxARMv7
>+   -   isLinuxAlpha
>+   -   isLinuxHppa
>+   -   isLinuxMips
>+   -   isLinuxMipsel
>+   -   isLinuxPpc
>+   -   isLinuxs390
>+   -   isLinuxs390x
>+   -   isLinuxSparc
>    -   isOSX
>    -   isOSXPPC
>    -   isSolaris
>@@ -104,6 +112,14 @@
>    -   compiler.cfg.linux.x86
>    -   compiler.cfg.linux.amd64
>    -   compiler.cfg.linux.armv7
>+   -   compiler.cfg.linux.alpha
>+   -   compiler.cfg.linux.hppa
>+   -   compiler.cfg.linux.mips
>+   -   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
>    -   compiler.cfg.solaris.amd64
>@@ -117,6 +133,14 @@
>    -   linker.cfg.linux.x86
>    -   linker.cfg.linux.amd64
>    -   linker.cfg.linux.armv7
>+   -   linker.cfg.linux.alpha
>+   -   linker.cfg.linux.hppa
>+   -   linker.cfg.linux.mips
>+   -   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
>    -   linker.cfg.solaris
>@@ -262,6 +286,82 @@
>         </or>
>       </and>
>     </condition>
>+    <condition property="isLinuxAlpha">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="alpha" />
>+      </and>
>+    </condition>
>+    <condition property="alpha">
>+      <os arch="alpha" />
>+    </condition>
>+    <condition property="arm">
>+      <os arch="arm" />
>+    </condition>
>+    <condition property="isLinuxHppa">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="hppa" />
>+      </and>
>+    </condition>
>+    <condition property="hppa">
>+      <os arch="hppa" />
>+    </condition>
>+    <condition property="isLinuxMips">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="mips" />
>+      </and>
>+    </condition>
>+    <condition property="mips">
>+      <os arch="mips" />
>+    </condition>
>+    <condition property="isLinuxMipsel">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="mipsel" />
>+      </and>
>+    </condition>
>+    <condition property="mipsel">
>+      <os arch="mipsel" />
>+    </condition>
>+    <condition property="isLinuxPpc">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="ppc" />
>+      </and>
>+    </condition>
>+    <condition property="ppc">
>+      <os arch="ppc" />
>+    </condition>
>+    <condition property="isLinuxs390">
>+      <and>
>+        <istrue value="${isLinux}" />
>+        <os arch="s390" />
>+      </and>
>+    </condition>
>+    <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}" />
>+        <os arch="sparc" />
>+      </and>
>+    </condition>
>+    <condition property="sparc">
>+      <os arch="sparc" />
>+    </condition>
>+
>     <condition property="isLinuxX86">
>       <and>
>         <istrue value="${isLinux}" />
>@@ -384,6 +484,14 @@
>     <echo message="LinuxIA64=${isLinuxIA64}" />
>     <echo message="LinuxX86=${isLinuxX86}" />
>     <echo message="LinuxARMv7=${isLinuxARMv7}" />
>+    <echo message="LinuxAlpha=${isLinuxAlpha}" />
>+    <echo message="LinuxHppa=${isLinuxHppa}" />
>+    <echo message="LinuxMips=${isLinuxMips}" />
>+    <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}" />
>     <echo message="OS X x32=${use.macosx32}" />
>@@ -433,11 +541,44 @@
>     <property name="os.and.arch" value="linux-armv7" />
>   </target>
> 
>+  <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
>+    <property name="os.and.arch" value="linux-alpha" />
>+  </target>
>+
>+  <target name="gluegen.cpptasks.detect.os.linux.hppa" unless="gluegen.cpptasks.detected.os.2" if="isLinuxHppa">
>+    <property name="os.and.arch" value="linux-hppa" />
>+  </target>
>+
>+  <target name="gluegen.cpptasks.detect.os.linux.mips" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips">
>+    <property name="os.and.arch" value="linux-mips" />
>+  </target>
>+
>+  <target name="gluegen.cpptasks.detect.os.linux.mipsel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsel">
>+    <property name="os.and.arch" value="linux-mipsel" />
>+  </target>
>+
>+  <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
>+    <property name="os.and.arch" value="linux-ppc" />
>+  </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>
>+
>+  <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>
>+
>+
>   <target name="gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7">
>     <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" 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" />
>@@ -894,6 +1035,30 @@
>     <linker id="linker.cfg.linux.armv7" name="gcc">
>     </linker>
> 
>+    <linker id="linker.cfg.linux.alpha" name="gcc">
>+    </linker>
>+
>+    <linker id="linker.cfg.linux.hppa" name="gcc">
>+    </linker>
>+
>+    <linker id="linker.cfg.linux.mips" name="gcc">
>+    </linker>
>+
>+    <linker id="linker.cfg.linux.mipsel" name="gcc">
>+    </linker>
>+
>+    <linker id="linker.cfg.linux.ppc" name="gcc">
>+    </linker>
>+
>+    <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>
>+
>     <compiler id="linker.cfg.android" name="gcc">
>         
>     </compiler>
>@@ -1043,11 +1208,18 @@
>       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
>     </target>
> 
>+    <target name="gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinuxAlpha">
>+      <echo message="Linux.alpha" />
>+      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.alpha" /> 
>+      <property name="linker.cfg.id.base"            value="linker.cfg.linux.alpha" /> 
>+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/alpha" />
>+    </target>
>+
>     <target name="gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinuxARMv7">
>       <echo message="Linux.armv7" />
>       <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.armv7" /> 
>       <property name="linker.cfg.id.base"            value="linker.cfg.linux.armv7" /> 
>-      <property name="java.lib.dir.platform"         value="${env.TARGET_JAVA_LIBS}" />
>+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/arm" />
>     </target>
> 
>     <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
>@@ -1057,7 +1229,56 @@
>       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ia64" />
>     </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" if="isLinux">
>+    <target name="gluegen.cpptasks.declare.compiler.linux.hppa" if="isLinuxHppa">
>+      <echo message="Linux.hppa" />
>+      <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/hppa" />
>+    </target>
>+
>+    <target name="gluegen.cpptasks.declare.compiler.linux.mips" if="isLinuxMips">
>+      <echo message="Linux.Mips" />
>+      <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/mips" />
>+    </target>
>+
>+    <target name="gluegen.cpptasks.declare.compiler.linux.mipsel" if="isLinuxMipsel">
>+      <echo message="Linux.Mipsel" />
>+      <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/mipsel" />
>+    </target>
>+
>+    <target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
>+      <echo message="Linux.Ppc" />
>+      <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/ppc" />
>+    </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" /> 
>+      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
>+      <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" /> 
>+      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
>+      <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.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
>         <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
>     </target>
> 
>-- 
>1.7.7.3
>

Actions: View | Diff

Attachments on bug 488: 244 | 308