diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-07-18 22:21:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-07-18 22:21:42 +0000 |
| commit | 44f73586ba93b3187afd126ffd3dae3613fed4b8 (patch) | |
| tree | 44ddd717ef1fdc1357bfc97c4b970e720e2cd9d8 /openjdk7/build | |
| parent | a537d1c58345ebe5efc62f0493a907caf2e009d7 (diff) | |
| download | asb-44f73586ba93b3187afd126ffd3dae3613fed4b8.tar.gz asb-44f73586ba93b3187afd126ffd3dae3613fed4b8.tar.xz | |
openjdk7: update to Java7 Update 231 Build 01 (icedtea-2.6.19)
Diffstat (limited to 'openjdk7/build')
| -rw-r--r-- | openjdk7/build/BUILDING.txt | 4 | ||||
| -rwxr-xr-x | openjdk7/build/openjdk7.SlackBuild | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/openjdk7/build/BUILDING.txt b/openjdk7/build/BUILDING.txt index 215c0668..c4a337e7 100644 --- a/openjdk7/build/BUILDING.txt +++ b/openjdk7/build/BUILDING.txt @@ -16,8 +16,8 @@ # Check ICEDTEA_BRANCH value in Makefile.in: ICEDTEA_MAJOR="icedtea7" -ICEDTEA_BRANCH="2.6.17" -ICEDTEA_VERSION="2.6.17" +ICEDTEA_BRANCH="2.6.19" +ICEDTEA_VERSION="2.6.19" DROPURL="http://icedtea.classpath.org/download/drops" SUPPURL="${DROPURL}/${ICEDTEA_MAJOR}/${ICEDTEA_BRANCH}" diff --git a/openjdk7/build/openjdk7.SlackBuild b/openjdk7/build/openjdk7.SlackBuild index 9d9925c7..57d4c70c 100755 --- a/openjdk7/build/openjdk7.SlackBuild +++ b/openjdk7/build/openjdk7.SlackBuild @@ -23,9 +23,9 @@ PKGNAM1=openjdk7 PKGNAM2=openjre7 -JAVAVER=7u201 -JAVABLD=b00 -ICEDTEA=2.6.17 +JAVAVER=7u231 +JAVABLD=b01 +ICEDTEA=2.6.19 VERSION="${JAVAVER}_${JAVABLD}" BUILD=${BUILD:-1} @@ -75,12 +75,12 @@ if [ -z "$ARCH" ]; then fi if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" LIBDIRSUFFIX="" LIB_ARCH=i386 ARCH_OPTS=" --disable-jamvm " elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" LIBDIRSUFFIX="" LIB_ARCH=i386 ARCH_OPTS=" --disable-jamvm " @@ -326,9 +326,9 @@ ln -sf /etc/java/nss.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss. # 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 +cat $CWD/doinst.sh > $PKG1/install/doinst.sh cat $CWD/slack-desc.jre > $PKG2/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG2/install/doinst.sh +cat $CWD/doinst.sh > $PKG2/install/doinst.sh # Add documentation files: mkdir -p $PKG1/usr/doc/$PKGNAM1-$VERSION/icedtea |