Mercurial > hg > openjdk > aarch64-port

changeset 1188:37b9ea60f8ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update cross_configure and cross_compile for new sysroots
author Edward Nevill edward.nevill@linaro.org
date Mon, 22 Sep 2014 12:20:57 +0100
parents 776fec4137e4
children 812eb2e6e56e
files cross_compile cross_configure
diffstat 2 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/cross_compile	Fri Sep 05 07:01:11 2014 -0400
+++ b/cross_compile	Mon Sep 22 12:20:57 2014 +0100
@@ -3,10 +3,12 @@
 	if [ ! -d $IWD/sysroots ]; then
 	  echo "$IWD/sysroots not found!!!"
 	  echo "Please either install sysroots in $IWD/sysroots, or link $IWD/sysroots to your installed sysroots."
-	  echo "For a limited period of time a pre-populated sysroots may be downloaded from http://people.linaro.org/~edward.nevill/sysroots.tar.gz"
+          echo "A pre-populated sysroots may be downloaded from http://openjdk.linaro.org/sysroots/sysroots_140918.tar.xz"
 	  exit 1
 	fi
 mkdir -p /tmp/oe_45434e/jenkins-setup/build/tmp-eglibc
+mkdir -p /tmp/oe_45434e/jenkins-setup/build/tmp-glibc
 ln -f -s $IWD/sysroots /tmp/oe_45434e/jenkins-setup/build/tmp-eglibc/
+ln -f -s $IWD/sysroots /tmp/oe_45434e/jenkins-setup/build/tmp-glibc/
 export ALT_SDT_H=$IWD/sysroots/genericarmv8/usr/include/sys/sdt.h
-make STRIP_POLICY=no_strip POST_STRIP_CMD="" images
+make STRIP_POLICY=no_strip POST_STRIP_CMD="" LOG=debug images
--- a/cross_configure	Fri Sep 05 07:01:11 2014 -0400
+++ b/cross_configure	Mon Sep 22 12:20:57 2014 +0100
@@ -3,26 +3,28 @@
 if [ ! -d $IWD/sysroots ]; then
   echo "$IWD/sysroots not found!!!"
   echo "Please either install sysroots in $IWD/sysroots, or link $IWD/sysroots to your installed sysroots."
-  echo "For a limited period of time a pre-populated sysroots may be downloaded from http://people.linaro.org/~edward.nevill/sysroots.tar.gz"
+  echo "A pre-populated sysroots may be downloaded from http://openjdk.linaro.org/sysroots/sysroots_140918.tar.xz"
   exit 1
 fi
 mkdir -p /tmp/oe_45434e/jenkins-setup/build/tmp-eglibc
+mkdir -p /tmp/oe_45434e/jenkins-setup/build/tmp-glibc
 ln -f -s $IWD/sysroots /tmp/oe_45434e/jenkins-setup/build/tmp-eglibc/
+ln -f -s $IWD/sysroots /tmp/oe_45434e/jenkins-setup/build/tmp-glibc/
 export STRINGS="aarch64-oe-linux-strings"
-export CC="aarch64-oe-linux-gcc  "
+export CC="aarch64-oe-linux-gcc"
 export OBJCOPY="aarch64-oe-linux-objcopy"
-export LD="aarch64-oe-linux-ld "
-export CCLD="aarch64-oe-linux-gcc  "
+export LD="aarch64-oe-linux-ld"
+export CCLD="aarch64-oe-linux-gcc"
 export PKG_CONFIG_LIBDIR="$IWD/sysroots/genericarmv8//usr/lib/pkgconfig"
 export PKG_CONFIG_DISABLE_UNINSTALLED="yes"
 export CPP="aarch64-oe-linux-gcc -E "
 export STRIP="aarch64-oe-linux-strip"
 export PKG_CONFIG_SYSROOT_DIR="$IWD/sysroots/genericarmv8"
 export RANLIB="aarch64-oe-linux-ranlib"
-export CXX="aarch64-oe-linux-g++  "
+export CXX="aarch64-oe-linux-g++"
 export OBJDUMP="aarch64-oe-linux-objdump"
 export NM="aarch64-oe-linux-nm"
 export AS="aarch64-oe-linux-as"
 export AR="aarch64-oe-linux-ar"
 export PATH="$IWD/sysroots/x86_64-linux/usr/bin/aarch64-oe-linux:$IWD/sysroots/genericarmv8/usr/bin/crossscripts:$IWD/sysroots/x86_64-linux/usr/sbin:$IWD/sysroots/x86_64-linux/usr/bin:$IWD/sysroots/x86_64-linux/sbin:$IWD/sysroots/x86_64-linux//bin:/usr/sbin:/usr/bin:/sbin:/bin"
-sh ./configure --with-debug-level=fastdebug --with-jvm-variants=client --with-sys-root=$IWD/sysroots/genericarmv8 --enable-unlimited-crypto --openjdk-target=aarch64-oe-linux --with-cacerts-file=$IWD/sysroots/x86_64-linux/usr/lib/jvm/icedtea7-native/jre/lib/security/cacerts --with-zlib=system --with-stdc++lib=dynamic --with-boot-jdk=$IWD/sysroots/x86_64-linux/usr/lib/jvm/icedtea7-native 
+sh ./configure --with-debug-level=release --with-jvm-variants=server --with-sys-root=$IWD/sysroots/genericarmv8 --enable-unlimited-crypto --openjdk-target=aarch64-oe-linux --with-zlib=system --with-stdc++lib=dynamic