This one is the final version which built working packages

1 files changed, 52 insertions, 14 deletions

diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index 08197e9d..f451d1a4 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2011  Eric Hameleers, Eindhoven, The Netherlands
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PKGNAM1=jdk
-PKGNAM2=jre
+PKGNAM1=openjdk
+PKGNAM2=openjre
 JAVAVER=7
 JAVABLD=b147
 ICEDTEA=2.0
@@ -32,6 +32,10 @@ VERSION="${JAVAVER}_${JAVABLD}"
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
+# If BOOTSTRAP is set to "YES" then we bootstrap the build using GCC's java compiler (gcj)
+# instead of a depending on a pre-installed version of OpenJDK to build OpenJDK.
+BOOTSTRAP=${BOOTSTRAP:-"NO"}
+
 # Sources the script requires. Note that the Makefile contains SHA256SUM values
 # for all of these tarballs; if the tarball does not verify then it will be
 # downloaded again:
@@ -45,12 +49,14 @@ SRC_LANGTOOLS=langtools.tar.gz
 SRC_OPENJDK=openjdk.tar.gz
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -66,12 +72,21 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
   LIB_ARCH=amd64
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
   LIB_ARCH=$ARCH
 fi
 
+case "ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG1=$TMP/package-$PKGNAM1
@@ -92,20 +107,39 @@ find . \
 
 # We start with creating a proper build environment.
 
+# Prevent an error which aborts the build:
+mkdir -p bootstrap/boot/jre/lib
+
 unset CLASSPATH
 unset JAVA_HOME
 unset MAKEFLAGS
 
-export ANT_HOME=/usr/share/ant
-export JVMDIR=/usr/lib${LIBDIRSUFFIX}/java
+if [ "$BOOTSTRAP" = "YES" -o "$BOOTSTRAP" = "yes" ]; then
+  # Use gcc's java compiler:
+  export JVMDIR=/usr/lib${LIBDIRSUFFIX}/jvm
+  export ALT_BOOTDIR=/usr/lib${LIBDIRSUFFIX}/jvm
+  export ECJJAR=/usr/share/java/ecj.jar
+  export RTJAR=$TMP/icedtea-$ICEDTEA/bootstrap/boot/jre/lib/rt.jar
+  ! echo $PATH | grep -q jvm/bin && export PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
+  EXTRA_OPTS="--enable-bootstrap --with-gcj=/usr/bin/gcj"
+else
+  # Use a pre-installed OpenJDK:
+  export JVMDIR=/usr/lib${LIBDIRSUFFIX}/java
+  EXTRA_OPTS="--disable-bootstrap"
+fi
 
-export BUILD_NUMBER=$JAVABLD
+export ANT_HOME=/usr/share/ant
+export ALT_FREETYPE_LIB_PATH=/usr/lib${LIBDIRSUFFIX}
 export ALT_PARALLEL_COMPILE_JOBS="${NUMJOBS/-j}"
+export BUILD_NUMBER=$JAVABLD
 export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 export LANG=C
 export OS_VARIANT_NAME="Slackware"
 export OS_VARIANT_VERSION=$(cat /etc/slackware-version | cut -f2 -d' ')
 
+#cp $CWD/patches/*.patch $TMP/icedtea-$ICEDTEA/patches/
+#export DISTRIBUTION_BOOT_PATCHES="patches/some.icedtea.slackware.patch"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -120,11 +154,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-langtools-src-zip=$CWD/sources/${SRC_LANGTOOLS} \
   --with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \
   --with-jdk-home=${JVMDIR} \
-  --enable-nss \
   --disable-docs \
-  --disable-bootstrap \
+  --disable-jamvm \
+  --disable-jdk-tests \
+  --disable-langtools-tests \
   --disable-system-lcms \
-  --build=$ARCH-slackware-linux
+  --enable-nss \
+  $EXTRA_OPTS \
+  --build=$TARGET
+  #--with-javac=${JVMDIR}/bin/javac \
 
 make || exit 1