diff options
Diffstat (limited to 'source.local/l/openjdk/openjdk.SlackBuild')
| -rwxr-xr-x | source.local/l/openjdk/openjdk.SlackBuild | 49 |
1 files changed, 16 insertions, 33 deletions
diff --git a/source.local/l/openjdk/openjdk.SlackBuild b/source.local/l/openjdk/openjdk.SlackBuild index 8a83ee3..8590f5a 100755 --- a/source.local/l/openjdk/openjdk.SlackBuild +++ b/source.local/l/openjdk/openjdk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2011, 2012 Eric Hameleers, Eindhoven, The Netherlands +# Copyright 2011, 2012, 2013 Eric Hameleers, Eindhoven, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ PKGNAM1=openjdk PKGNAM2=openjre -JAVAVER=7u9 -JAVABLD=b30 -ICEDTEA=2.3.3 +JAVAVER=7u21 +JAVABLD=b02 +ICEDTEA=2.3.9 VERSION="${JAVAVER}_${JAVABLD}" BUILD=${BUILD:-1} @@ -50,7 +50,9 @@ DEBUGBUILD=${DEBUGBUILD:-"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: + SRC_CACAO=cacao-a567bcb7f589.tar.gz +SRC_JAMVM=jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz SRC_CORBA=corba.tar.gz SRC_HOTSPOT=hotspot.tar.gz SRC_JAXP=jaxp.tar.gz @@ -75,41 +77,32 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" LIB_ARCH=i386 - ARCH_OPTS="" + ARCH_OPTS=" --disable-jamvm " elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" LIB_ARCH=i386 - ARCH_OPTS="" + ARCH_OPTS=" --disable-jamvm " elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" LIB_ARCH=amd64 - ARCH_OPTS="" + ARCH_OPTS=" --disable-jamvm " elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" - LIB_ARCH=arm - #ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}" - ARCH_OPTS="--enable-zero=yes" + LIB_ARCH=$ARCH + ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" LIBDIRSUFFIX="" - export LIB_ARCH=arm - export NO_DOCS=true - export ZERO_BUILD=true - export ZERO_LIBARCH=arm - export ZERO_ARCHDEF=ARM - export ZERO_ENDIANNESS=little - export LIBFFI_CFLAGS="`pkg-config --cflags libffi` " - export LIBFFI_LIBS="-lffi " - #ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}" - ARCH_OPTS="--enable-zero=yes" + LIB_ARCH=$ARCH + ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" LIB_ARCH=$ARCH - ARCH_OPTS="" + ARCH_OPTS=" --disable-jamvm " fi case "$ARCH" in @@ -124,12 +117,6 @@ rm -rf icedtea-$ICEDTEA tar xvf $CWD/sources/icedtea-$ICEDTEA.tar.?z* || exit 1 cd icedtea-$ICEDTEA || exit 1 -case "$ARCH" in - arm*) # Fix a patch which fails to apply and thus aborts the build: - cat $CWD/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch | patch -p1 --verbose || exit 1 ;; - *) ;; -esac - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -163,11 +150,8 @@ if [ "$BOOTSTRAP" = "YES" -o "$BOOTSTRAP" = "yes" ]; then 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" - # Bootstrap without cacao: - case "$ARCH" in - arm*) ARCH_OPTS="--enable-zero=yes" ;; - *) ARCH_OPTS="" ;; - esac + # Bootstrap without cacao/jamvm: + ARCH_OPTS="" else # Use a pre-installed OpenJDK: export JVMDIR=/usr/lib${LIBDIRSUFFIX}/java @@ -201,7 +185,6 @@ CXXFLAGS="$SLKCFLAGS" \ --with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \ --with-jdk-home=${JVMDIR} \ --disable-docs \ - --disable-jamvm \ --disable-jdk-tests \ --disable-langtools-tests \ --disable-system-lcms \ |