diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-06-02 21:56:07 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-06-02 21:56:07 +0000 |
| commit | 10313f2b2dee3cb04062afc710b321f4386b8ae9 (patch) | |
| tree | 0cd577ad1eecb738fa0eb34e7a687017f1df8623 /openjdk | |
| parent | a25145c219cd6fce72df2e6d6a1b442b5c177b16 (diff) | |
| download | asb-10313f2b2dee3cb04062afc710b321f4386b8ae9.tar.gz asb-10313f2b2dee3cb04062afc710b321f4386b8ae9.tar.xz | |
The SlackBuild for java 7u4_b21
Diffstat (limited to 'openjdk')
| -rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index 9338ea4a..500cabbd 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -24,9 +24,9 @@ PKGNAM1=openjdk PKGNAM2=openjre -JAVAVER=7u3 -JAVABLD=b03 -ICEDTEA=2.1 +JAVAVER=7u4 +JAVABLD=b21 +ICEDTEA=2.2 VERSION="${JAVAVER}_${JAVABLD}" BUILD=${BUILD:-1} @@ -118,6 +118,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# First check: are our sources complying with our SlackBuild? +JDKU=$(cat Makefile.in | grep ^JDK_UPDATE_VERSION | tr -d ' ' | cut -f2 -d=) +JDKB=$(cat Makefile.in | grep ^OPENJDK_VERSION | tr -d ' ' | cut -f2 -d=) +echo "** This SlackBuild creates a package for Java $JAVAVER using OpenJDK build $JAVABLD" +echo "** The script uses icedtea-$ICEDTEA as a build framework." +echo "** Icedtea will (download and) build Java update $JDKU using OpenJDK build $JDKB" +echo "** If you see a mismatch here, then you have 5 seconds to abort this script (press Ctrl-C) and fix it." +sleep 5 + # We start with creating a proper build environment. # Prevent an error which aborts the build: @@ -153,7 +162,7 @@ export OS_VARIANT_NAME="Slackware" export OS_VARIANT_VERSION=$(cat /etc/slackware-version | cut -f2 -d' ') cp $CWD/patches/*.patch $TMP/icedtea-$ICEDTEA/patches/ -export DISTRIBUTION_BOOT_PATCHES="patches/openjdk.arm_fixes.patch patches/icedtea,zero_debuginfo.patch" +export DISTRIBUTION_BOOT_PATCHES="patches/openjdk.arm_fixes.patch" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |