From 2d57b3cbb4a8189ecb5523f6d8de3aa37db78a13 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 22 Jul 2011 07:43:44 +0200
Subject: Cleanup [cross] compile properties

- linux-armv7 (ubuntu)

  - added scripts/make.gluegen.all.linux-armv7-cross.sh

  - added symbolic links to cross toolchain (gcc, ld, ..)
    allowing gluegen's cpptask to pick it up

- android-armv7 (android)

  - we have scripts/make.gluegen.all.android-armv7-cross.sh
---
 make/lib/gluegen-cpptasks-android-arm.xml          | 93 ----------------------
 make/lib/gluegen-cpptasks-android-armv7.xml        | 90 +++++++++++++++++++++
 make/lib/linux-x86_64/arm-linux-gnueabi/bin/gcc    |  1 +
 make/lib/linux-x86_64/arm-linux-gnueabi/bin/ld     |  1 +
 .../lib/linux-x86_64/arm-linux-gnueabi/bin/objdump |  1 +
 make/lib/linux-x86_64/arm-linux-gnueabi/bin/strip  |  1 +
 6 files changed, 94 insertions(+), 93 deletions(-)
 delete mode 100644 make/lib/gluegen-cpptasks-android-arm.xml
 create mode 100644 make/lib/gluegen-cpptasks-android-armv7.xml
 create mode 120000 make/lib/linux-x86_64/arm-linux-gnueabi/bin/gcc
 create mode 120000 make/lib/linux-x86_64/arm-linux-gnueabi/bin/ld
 create mode 120000 make/lib/linux-x86_64/arm-linux-gnueabi/bin/objdump
 create mode 120000 make/lib/linux-x86_64/arm-linux-gnueabi/bin/strip

(limited to 'make/lib')

diff --git a/make/lib/gluegen-cpptasks-android-arm.xml b/make/lib/gluegen-cpptasks-android-arm.xml
deleted file mode 100644
index d86f26c..0000000
--- a/make/lib/gluegen-cpptasks-android-arm.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
-
-        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
-
-    In case you want to compile for 32bit on a 64bit machine,
-    you might also need to set the 'os.arch' to 'x86'.
-    Example: gluegen/make/make.gluegen.all.linux-x86.sh
-  -->
-
-<project name="GlueGen-cpptasks" basedir="." >
-
-<import file="../gluegen-cpptasks-base.xml" optional="false" />
-<property name="isAndroid"    value="true"/>
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
-    <echo message="Custom forced compiler Android NDK, linker.cfg.android" />
-    <!--<compiler id="compiler.cfg.android" name="arm-linux-androideabi-gcc"> -->
-    <compiler id="compiler.cfg.android" name="gcc">
-<!--      <compilerarg value="-v" /> -->
-      <compilerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
-      <compilerarg value="-B" /> <!--add additional directory for search  --> 
-      <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> 
-      <compilerarg value="-march=armv7-a" /> 
-      <compilerarg value="-fpic" /> 
-      <compilerarg value="-DANDROID" /> 
-      <compilerarg value="${env.NDK_INCLUDE}" /> 
-      <compilerarg value="-I${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--inclides stdarg.h -->
-      <compilerarg value="-Wl,--demangle" /> 
-      <compilerarg value="-nostdlib" /> 
-      <compilerarg value="-Bdynamic" /> 
-      <compilerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
-      <compilerarg value="-Wl,--gc-sections" /> 
-      <compilerarg value="-Wl,-z,nocopyreloc" /> 
-      <compilerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
-      <compilerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
-<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
-      <compilerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
-<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
-      <compilerarg value="-Wl,--no-undefined" /> 
-      <compilerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
-      <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
-      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> 
-      <defineset>
-        <define name="ANDROID" />
-      </defineset>
-    </compiler>
-
-    <!--<linker id="linker.cfg.android" name="arm-linux-androideabi-gcc">-->
-    <linker id="linker.cfg.android" name="gcc">
-         <linkerarg value="-Wl,--demangle" /> 
-      	 <linkerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
-         <linkerarg value="-nostdlib" /> 
-         <linkerarg value="-Bdynamic" /> 
-         <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
-         <linkerarg value="-Wl,--gc-sections" /> 
-         <linkerarg value="-Wl,-z,nocopyreloc" /> 
-         <linkerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
-         <linkerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
-<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
-         <linkerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
-<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
-         <linkerarg value="-Wl,--no-undefined" /> 
-         <linkerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
-         <linkerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
-    <!--     <linkerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> -->
-    </linker>
-
-</target>
-
-<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
-  <echo message="Custom forced Linux.x86 cross compile android" />
-  <property name="isLinuxArmv7"    value="true"/>
-  <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
-  <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
-  <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
-</target>
-
-<target name="declare.linux.android">
-      <echo message="android.arm" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id"                        value="linker.cfg.android" />
-</target>
-
-</project>
-
-
diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml
new file mode 100644
index 0000000..17cb5c9
--- /dev/null
+++ b/make/lib/gluegen-cpptasks-android-armv7.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    This is an example of how to add custom compiler/linker 
+    arguments for a crosscompiler.
+
+    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
+
+        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
+
+    In case you want to compile for 32bit on a 64bit machine,
+    you might also need to set the 'os.arch' to 'x86'.
+    Example: gluegen/make/make.gluegen.all.linux-x86.sh
+  -->
+
+<project name="GlueGen-cpptasks" basedir="." >
+
+<import file="../gluegen-cpptasks-base.xml" optional="false" />
+
+<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
+    <echo message="Custom forced compiler Android NDK, linker.cfg.android" />
+    <!--<compiler id="compiler.cfg.android" name="arm-linux-androideabi-gcc"> -->
+    <compiler id="compiler.cfg.android" name="gcc">
+      <compilerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
+      <compilerarg value="-B" /> <!--add additional directory for search  --> 
+      <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> 
+      <compilerarg value="-march=armv7-a" /> 
+      <compilerarg value="-fpic" /> 
+      <compilerarg value="-DANDROID" /> 
+      <compilerarg value="${env.NDK_INCLUDE}" /> 
+      <compilerarg value="-I${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--inclides stdarg.h -->
+      <compilerarg value="-Wl,--demangle" /> 
+      <compilerarg value="-nostdlib" /> 
+      <compilerarg value="-Bdynamic" /> 
+      <compilerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
+      <compilerarg value="-Wl,--gc-sections" /> 
+      <compilerarg value="-Wl,-z,nocopyreloc" /> 
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
+<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
+<!--      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
+      <compilerarg value="-Wl,--no-undefined" /> 
+      <compilerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
+      <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
+      <compilerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> 
+      <defineset>
+        <define name="ANDROID" />
+      </defineset>
+    </compiler>
+
+    <!--<linker id="linker.cfg.android" name="arm-linux-androideabi-gcc">-->
+    <linker id="linker.cfg.android" name="gcc">
+         <linkerarg value="-Wl,--demangle" /> 
+      	 <linkerarg value="--sysroot=${env.TARGET_OS_PATH}" />  <!-- set root dir for lib and include -->
+         <linkerarg value="-nostdlib" /> 
+         <linkerarg value="-Bdynamic" /> 
+         <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> 
+         <linkerarg value="-Wl,--gc-sections" /> 
+         <linkerarg value="-Wl,-z,nocopyreloc" /> 
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> 
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> 
+<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
+         <linkerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> 
+<!--         <linkerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
+         <linkerarg value="-Wl,--no-undefined" /> 
+         <linkerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> 
+         <linkerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
+    <!--     <linkerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> -->
+    </linker>
+
+</target>
+
+<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
+  <echo message="Custom forced Linux.x86 cross compile android" />
+  <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
+  <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
+  <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
+</target>
+
+<target name="declare.linux.android">
+      <echo message="android.arm" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
+      <property name="linker.cfg.id"                        value="linker.cfg.android" />
+</target>
+
+</project>
+
+
diff --git a/make/lib/linux-x86_64/arm-linux-gnueabi/bin/gcc b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/gcc
new file mode 120000
index 0000000..edeaa99
--- /dev/null
+++ b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/gcc
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-gcc
\ No newline at end of file
diff --git a/make/lib/linux-x86_64/arm-linux-gnueabi/bin/ld b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/ld
new file mode 120000
index 0000000..68f4fae
--- /dev/null
+++ b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/ld
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-ld
\ No newline at end of file
diff --git a/make/lib/linux-x86_64/arm-linux-gnueabi/bin/objdump b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/objdump
new file mode 120000
index 0000000..a48d9ee
--- /dev/null
+++ b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/objdump
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-objdump
\ No newline at end of file
diff --git a/make/lib/linux-x86_64/arm-linux-gnueabi/bin/strip b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/strip
new file mode 120000
index 0000000..8dab56b
--- /dev/null
+++ b/make/lib/linux-x86_64/arm-linux-gnueabi/bin/strip
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-strip
\ No newline at end of file
-- 
cgit v1.2.3