From 117565b7d8771b6c9c2144b2d1ef5a131446e058 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 7 Apr 2019 22:34:37 +0200 Subject: Bug 1190: Fix arm6hf + aarch64 gcc options, adapt glibc-compat-symbols.h - arm6hf needs the fpu to be specified, we still use the lowest armv6 hard float denominator - aarch64 shall have the -march compiler argument as well - glibc-compat-symbols.h Finally drop the glibc versioning on memcpy for both --- make/scripts/make.gluegen.all.linux-armv6-cross.sh | 51 ---------------------- make/scripts/make.gluegen.all.linux-armv6.sh | 21 --------- 2 files changed, 72 deletions(-) delete mode 100755 make/scripts/make.gluegen.all.linux-armv6-cross.sh delete mode 100755 make/scripts/make.gluegen.all.linux-armv6.sh (limited to 'make/scripts') diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh deleted file mode 100755 index c8c8b8a..0000000 --- a/make/scripts/make.gluegen.all.linux-armv6-cross.sh +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh -fi - -# arm-linux-gnueabi == armel triplet -PATH=`pwd`/lib/toolchain/armsf-linux-gnueabi/bin:$PATH -export PATH - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxARMv6=true \ -# -DisX11=false \ - -export NODE_LABEL=. - -export HOST_UID=jogamp -export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL - -export TARGET_UID=jogamp -export TARGET_IP=panda01 -export TARGET_ROOT=/home/jogamp/projects-cross -export TARGET_ANT_HOME=/usr/share/ant - -export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armel -export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib -export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm - -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml" - -#export JUNIT_DISABLED="true" -export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" - -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-linux-armv6 \ - $* 2>&1 | tee make.gluegen.all.linux-armv6-cross.log - - diff --git a/make/scripts/make.gluegen.all.linux-armv6.sh b/make/scripts/make.gluegen.all.linux-armv6.sh deleted file mode 100755 index 0ebf550..0000000 --- a/make/scripts/make.gluegen.all.linux-armv6.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxX86=true \ -# -DisX11=true \ - -# arm-linux-gnueabi == armel triplet -export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi -export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm - -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml" - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-linux-armv6 \ - $* 2>&1 | tee make.gluegen.all.linux-armv6.log -- cgit v1.2.3