Update to openjdk 7u3 b03 using icedtea 2.1

1 files changed, 33 insertions, 31 deletions

diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index 0c39b290..48c4fde4 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -24,22 +24,24 @@
 
 PKGNAM1=openjdk
 PKGNAM2=openjre
-JAVAVER=7
-JAVABLD=b147
-ICEDTEA=2.0
+JAVAVER=7u3
+JAVABLD=b03
+ICEDTEA=2.1
 
 VERSION="${JAVAVER}_${JAVABLD}"
-BUILD=${BUILD:-3}
+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.
+# 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:
+SRC_CACAO=cacao-a567bcb7f589.tar.gz
 SRC_CORBA=corba.tar.gz
 SRC_HOTSPOT=hotspot.tar.gz
 SRC_ICEWEB=icedtea-web-1.1.4.tar.gz
@@ -65,22 +67,27 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
+  ARCH_OPTS=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
+  ARCH_OPTS=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
   LIB_ARCH=amd64
+  ARCH_OPTS=""
 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}"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
   LIB_ARCH=$ARCH
+  ARCH_OPTS=""
 fi
 
 case "ARCH" in
@@ -161,6 +168,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-langtools-tests \
   --disable-system-lcms \
   --enable-nss \
+  $ARCH_OPTS \
   $EXTRA_OPTS \
   --build=$TARGET
   #--with-javac=${JVMDIR}/bin/javac \
@@ -168,11 +176,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make || exit 1
 
 # Move the generated jre and sdk images to the respective packages:
-mkdir -p $PKG1/usr/lib${LIBDIRSUFFIX} $PKG2/usr/lib${LIBDIRSUFFIX}
+mkdir -p $PKG1/usr/lib${LIBDIRSUFFIX} $PKG2/usr/lib${LIBDIRSUFFIX}/java
 cp -a openjdk.build/j2sdk-image \
   $PKG1/usr/lib${LIBDIRSUFFIX}/java
 cp -a openjdk.build/j2re-image \
-  $PKG2/usr/lib${LIBDIRSUFFIX}/java
+  $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre
 
 # Generate a cacerts file from the certificates installed through our
 # ca-certificates package - the "cacerts" in the OpenJDK sources is empty.
@@ -186,38 +194,32 @@ if which keytool 1>/dev/null 2>&1 ; then
     done
     perl generate-cacerts.pl keytool all.crt
     install -p -m0644 cacerts $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security
-    install -p -m0644 cacerts $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security
+    install -p -m0644 cacerts $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security
   )
 fi
 
 # Pick a selection of fontconfig files:
 cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src
 cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc
-cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/fontconfig.{Ubuntu,}.properties.src
-cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/fontconfig.{Ubuntu,}.bfc
+cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src
+cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc
 
 # Symlinks are present in Slackware historically:
 ( cd $PKG1/usr/lib${LIBDIRSUFFIX}
   ln -sf java jdk${VERSION}
 ) || exit 1
-( cd $PKG2/usr/lib${LIBDIRSUFFIX}
-  ln -sf java jre${VERSION}
-) || exit 1
-
-# Even more symlinks, this makes apps happy:
 ( cd $PKG2/usr/lib${LIBDIRSUFFIX}/java
-  mkdir jre
-  ln -sf ../lib jre/lib
-  ln -sf ../bin jre/bin
+  ln -sf jre jre${VERSION}
 ) || exit 1
 
 # Add the profile scripts:
 mkdir -p $PKG1/etc/profile.d $PKG2/etc/profile.d
-for file in $(ls $CWD/profile.d/*) ; do
+for file in $(ls $CWD/profile.d/openjdk*) ; do
   cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
     > $PKG1/etc/profile.d/$(basename $file)
+done
+for file in $(ls $CWD/profile.d/openjre*) ; do
   cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
-    -e 's#:${JAVA_HOME}/jre/bin##' \
     > $PKG2/etc/profile.d/$(basename $file)
 done
 chmod 755 $PKG1/etc/profile.d/* $PKG2/etc/profile.d/*
@@ -247,14 +249,12 @@ ln -sf /etc/java/java.security $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/securit
 cat $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg | sed -e 's/seamonkey-.*$/seamonkey/' > $PKG1/etc/java/nss.cfg.new
 ln -sf /etc/java/nss.cfg $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg
 # And the jre package:
-mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/jvm.cfg $PKG2/etc/java/jvm.cfg.new
-ln -sf /etc/java/jvm.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/jvm.cfg
-mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/java.policy $PKG2/etc/java/java.policy.new
-ln -sf /etc/java/java.policy $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/java.policy
-mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/java.security $PKG2/etc/java/java.security.new
-ln -sf /etc/java/java.security $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/java.security
-cat $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/nss.cfg | sed -e 's/seamonkey-.*$/seamonkey/' > $PKG2/etc/java/nss.cfg.new
-ln -sf /etc/java/nss.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/nss.cfg
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg $PKG2/etc/java/jvm.cfg.new
+ln -sf /etc/java/jvm.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/jvm.cfg
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy $PKG2/etc/java/java.policy.new
+ln -sf /etc/java/java.policy $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy
+mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security $PKG2/etc/java/java.security.new
+ln -sf /etc/java/java.security $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security
 
 # NOTE:
 # The openjdk does not build a mozilla plugin: install icedtea-web instead.
@@ -264,14 +264,16 @@ ln -sf /etc/java/nss.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/lib/security/nss.cfg
 )
 
 ( cd $PKG2/usr/lib${LIBDIRSUFFIX}
-  ln -sf ./java/lib/${LIB_ARCH}/server/libjvm.so .
+  ln -sf ./java/jre/lib/${LIB_ARCH}/server/libjvm.so .
 )
 
+# Add package description and deal with the .new files:
 mkdir -p $PKG1/install $PKG2/install
 cat $CWD/slack-desc.jdk > $PKG1/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG1/install/doinst.sh
+# The openjre package does not have a nss.cfg:
 cat $CWD/slack-desc.jre > $PKG2/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG2/install/doinst.sh
+zcat $CWD/doinst.sh.gz | grep -v nss.cfg.new > $PKG2/install/doinst.sh
 
 # Add documentation files:
 mkdir -p $PKG1/usr/doc/$PKGNAM1-$VERSION/icedtea