Attachment 311 Details for Bug 547 – Enable other architectures under GNU/Linux

[patch] Enable other architectures under GNU/Linux

0002-allow-the-Linux-build-of-jogl2-on-way-more-Linux-pla.patch (text/plain), 10.05 KB, created by Sylvestre Ledru on 2011-12-28 18:50:38 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvestre Ledru

Created: 2011-12-28 18:50:38 CET

Size: 10.05 KB

patch

obsolete

>From 17ae985420480b323b9a4ffd1e7e1fabb73024df Mon Sep 17 00:00:00 2001
>From: Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
>Date: Wed, 28 Dec 2011 16:17:02 +0100
>Subject: [PATCH 2/2]  allow the Linux build of jogl2 on way more Linux
> platforms
>
>---
> make/build-jogl.xml         |   38 +++++++++++++++++++++++++-
> make/build-nativewindow.xml |   38 +++++++++++++++++++++++++-
> make/build-newt.xml         |   62 ++++++++++++++++++++++++++++++++++++++++++-
> 3 files changed, 135 insertions(+), 3 deletions(-)
>
>diff --git a/make/build-jogl.xml b/make/build-jogl.xml
>index 511f147..c0cd805 100644
>--- a/make/build-jogl.xml
>+++ b/make/build-jogl.xml
>@@ -1189,8 +1189,44 @@
>       <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>     </target>
>+    
>+    <target name="c.configure.linux.hppa" if="isLinuxHppa">
>+      <echo message="Linux.HPPA" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
>+    
>+    <target name="c.configure.linux.mips" if="isLinuxMips">
>+      <echo message="Linux.MIPS" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
>+    
>+    <target name="c.configure.linux.mipsel" if="isLinuxMipsel">
>+      <echo message="Linux.MIPSEL" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
>+    
>+    <target name="c.configure.linux.ppc" if="isLinuxPpc">
>+      <echo message="Linux.PPC" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.s390" if="isLinuxs390">
>+      <echo message="Linux.S390" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.sparc" if="isLinuxSparc">
>+      <echo message="Linux.SPARC" />
>+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
>+    </target>
> 
>-    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
>+    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
> 
>     <target name="c.configure.android" if="isAndroid">
>       <echo message="Android" />
>diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
>index 7a06cef..ac269c6 100644
>--- a/make/build-nativewindow.xml
>+++ b/make/build-nativewindow.xml
>@@ -506,7 +506,43 @@
>       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>     </target>
> 
>-    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
>+    <target name="c.configure.linux.hppa" if="isLinuxHppa">
>+      <echo message="Linux.HPPA" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.mips" if="isLinuxMips">
>+      <echo message="Linux.MIPS" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.mipsel" if="isLinuxMipsel">
>+      <echo message="Linux.MIPSEL" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.ppc" if="isLinuxPpc">
>+      <echo message="Linux.PPC" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.s390" if="isLinuxs390">
>+      <echo message="Linux.S390" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux.sparc" if="isLinuxSparc">
>+      <echo message="Linux.SPARC" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
>+    </target>
>+
>+    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
> 
>     <target name="c.configure.android" if="isAndroid">
>       <echo message="Android" />
>diff --git a/make/build-newt.xml b/make/build-newt.xml
>index e849cb3..17c25c6 100644
>--- a/make/build-newt.xml
>+++ b/make/build-newt.xml
>@@ -368,13 +368,73 @@
>       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>     </target>
> 
>+    <target name="c.configure.linux.hppa" if="isLinuxHppa">
>+      <echo message="Linux.hppa" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>+    <target name="c.configure.linux.mips" if="isLinuxMips">
>+      <echo message="Linux.mips" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>+    <target name="c.configure.linux.mipsel" if="isLinuxMipsel">
>+      <echo message="Linux.mips" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>+    <target name="c.configure.linux.ppc" if="isLinuxPpc">
>+      <echo message="Linux.ppc" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>+    <target name="c.configure.linux.s390" if="isLinuxs390">
>+      <echo message="Linux.S390" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>+    <target name="c.configure.linux.sparc" if="isLinuxSparc">
>+      <echo message="Linux.sparc" />
>+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
>+                                                            else="linker.cfg.linux">
>+          <isset property="isX11" />
>+      </condition>
>+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
>+    </target>
>+
>     <target name="c.configure.linux.ia64" if="isLinuxIA64">
>       <echo message="Linux.IA64" />
>       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
>       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
>     </target>
> 
>-    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
>+    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
> 
>     <target name="c.configure.android" if="isAndroid">
>       <echo message="Android" />
>-- 
>1.7.7.3
>

Actions: View | Diff

Attachments on bug 547: 311