diff options
Diffstat (limited to 'openjdk/build/openjdk.SlackBuild')
-rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index b1707811..9fc0f24a 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -23,9 +23,9 @@ PKGNAM1=openjdk PKGNAM2=openjre -JAVAVER=7u99 -JAVABLD=b00 -ICEDTEA=2.6.5 +JAVAVER=8u77 +JAVABLD=b03 +ICEDTEA=3.0.0 VERSION="${JAVAVER}_${JAVABLD}" BUILD=${BUILD:-1} @@ -53,13 +53,14 @@ DEBUGBUILD=${DEBUGBUILD:-"NO"} SRC_CACAO=cacao_icedtea-${ICEDTEA}.tar.gz SRC_JAMVM=jamvm_icedtea-${ICEDTEA}.tar.gz -SRC_CORBA=corba_icedtea-${ICEDTEA}.tar.bz2 -SRC_HOTSPOT=hotspot_icedtea-${ICEDTEA}.tar.bz2 -SRC_JAXP=jaxp_icedtea-${ICEDTEA}.tar.bz2 -SRC_JAXWS=jaxws_icedtea-${ICEDTEA}.tar.bz2 -SRC_JDK=jdk_icedtea-${ICEDTEA}.tar.bz2 -SRC_LANGTOOLS=langtools_icedtea-${ICEDTEA}.tar.bz2 -SRC_OPENJDK=openjdk_icedtea-${ICEDTEA}.tar.bz2 +SRC_CORBA=corba_icedtea-${ICEDTEA}.tar.xz +SRC_HOTSPOT=hotspot_icedtea-${ICEDTEA}.tar.xz +SRC_JAXP=jaxp_icedtea-${ICEDTEA}.tar.xz +SRC_JAXWS=jaxws_icedtea-${ICEDTEA}.tar.xz +SRC_JDK=jdk_icedtea-${ICEDTEA}.tar.xz +SRC_LANGTOOLS=langtools_icedtea-${ICEDTEA}.tar.xz +SRC_NASHORN=nashorn_icedtea-${ICEDTEA}.tar.xz +SRC_OPENJDK=openjdk_icedtea-${ICEDTEA}.tar.xz # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -184,6 +185,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-jaxws-src-zip=$CWD/sources/${SRC_JAXWS} \ --with-jdk-src-zip=$CWD/sources/${SRC_JDK} \ --with-langtools-src-zip=$CWD/sources/${SRC_LANGTOOLS} \ + --with-nashorn-src-zip=$CWD/sources/${SRC_NASHORN} \ --with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \ --with-jdk-home=${JVMDIR} \ --disable-docs \ @@ -206,18 +208,20 @@ CXXFLAGS="$SLKCFLAGS" \ # In bootstrap build on Slackware 14, avoid a DSO linking error: sed -i -e "s/-o native-ecj/-lgcj -o native-ecj/" Makefile -make VERBOSE=TRUE || exit 1 +make V=1 || exit 1 # Move the generated jre and sdk images to the respective packages: mkdir -p $PKG1/usr/lib${LIBDIRSUFFIX} $PKG2/usr/lib${LIBDIRSUFFIX}/java -cp -a openjdk.build/j2sdk-image \ +cp -a openjdk.build/images/j2sdk-image \ $PKG1/usr/lib${LIBDIRSUFFIX}/java -cp -a openjdk.build/j2re-image \ +cp -a openjdk.build/images/j2re-image \ $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre # Fix a file permission issue, # see also http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 -chmod 644 $PKG1/usr/lib${LIBDIRSUFFIX}/java/lib/sa-jdi.jar +find $PKG2/usr/lib${LIBDIRSUFFIX}/java -iname "*.jar" -exec chmod 644 {} \; +find $PKG1/usr/lib${LIBDIRSUFFIX}/java -iname "*.jar" -exec chmod 644 {} \; +chmod 644 $PKG1/usr/lib${LIBDIRSUFFIX}/java/lib/ct.sym if [ "$DEBUGBUILD" = "NO" ]; then # Strip debug symbols from the libjvm.so but leave the symbol tables alone: @@ -244,12 +248,6 @@ else echo "** Missing keytool program (do you really have a Java installed?)" 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/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} @@ -347,6 +345,18 @@ cp -a \ AUTHORS COPYING HACKING INSTALL NEWS README* THANKYOU \ $PKG2/usr/doc/$PKGNAM2-$VERSION/icedtea +# Compress manual pages: +find $PKG1/usr/lib${LIBDIRSUFFIX}/java/man -type f -exec gzip -9 {} \; +for i in $( find $PKG1/usr/lib${LIBDIRSUFFIX}/java/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done +find $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/man -type f -exec gzip -9 {} \; +for i in $( find $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: if [ -r ChangeLog ]; then |