diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-03-17 16:13:53 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-03-17 16:13:53 +0000 |
| commit | 6ec0cddd399bfc4f7fb6cd1600e3dd71d8ea8694 (patch) | |
| tree | c7e90f3e66f71d5e375bb5b80f820c72033c0904 /openjdk7/build | |
| parent | d5588802d1ed9f4c66017f45ed8208b1f31ea7da (diff) | |
| download | asb-6ec0cddd399bfc4f7fb6cd1600e3dd71d8ea8694.tar.gz asb-6ec0cddd399bfc4f7fb6cd1600e3dd71d8ea8694.tar.xz | |
openjdk7: fix detection of Java7 Update and Build versions.
Diffstat (limited to 'openjdk7/build')
| -rwxr-xr-x | openjdk7/build/openjdk7.SlackBuild | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openjdk7/build/openjdk7.SlackBuild b/openjdk7/build/openjdk7.SlackBuild index 21bec1b5..9d9925c7 100755 --- a/openjdk7/build/openjdk7.SlackBuild +++ b/openjdk7/build/openjdk7.SlackBuild @@ -31,7 +31,8 @@ VERSION="${JAVAVER}_${JAVABLD}" BUILD=${BUILD:-1} TAG=${TAG:-"alien"} -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} +# No spaces inside since it kills the build: +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -125,8 +126,8 @@ find . \ -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 ^BUILD_VERSION | tr -d ' ' | cut -f2 -d=) +JDKU=$(grep "^ *JDK_UPDATE_VERSION" acinclude.m4 | tr -d ' ' | cut -f2 -d=) +JDKB=$(grep "^ *BUILD_VERSION" acinclude.m4 | 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" |