Updated to icedtea-2.4.1 for openjdk-7u40_b31

1 files changed, 13 insertions, 16 deletions

diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index 321c4247..b9cf0eb0 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -24,8 +24,8 @@
 PKGNAM1=openjdk
 PKGNAM2=openjre
 JAVAVER=7u40
-JAVABLD=b20
-ICEDTEA=2.4.0
+JAVABLD=b31
+ICEDTEA=2.4.1
 
 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-e215e36be9fc.tar.gz
+SRC_JAMVM=jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz
 SRC_CORBA=corba.tar.gz
 SRC_HOTSPOT=hotspot.tar.gz
 SRC_JAXP=jaxp.tar.gz
@@ -75,32 +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=$ARCH
-  ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
+  LIB_ARCH=arm
+  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=""
-  LIB_ARCH=$ARCH
-  ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
+  LIB_ARCH=arm
+  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
@@ -115,10 +117,6 @@ rm -rf icedtea-$ICEDTEA
 tar xvf $CWD/sources/icedtea-$ICEDTEA.tar.?z* || exit 1
 cd icedtea-$ICEDTEA || exit 1
 
-## Fix Zero compilation, permanent fix will be in icedtea-2.3.5:
-#cat $CWD/patches/icedtea_zero_buildfix.patch | patch -p1 --verbose \
-#  2>&1 $OUTPUT/patch-${PRGNAM}.log
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -152,7 +150,7 @@ 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:
+  # Bootstrap without cacao/jamvm:
   ARCH_OPTS=""
 else
   # Use a pre-installed OpenJDK:
@@ -187,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 \