diff options
Diffstat (limited to 'development/openjdk7/openjdk7.SlackBuild')
| -rw-r--r-- | development/openjdk7/openjdk7.SlackBuild | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild index 1882d91d17..202502482c 100644 --- a/development/openjdk7/openjdk7.SlackBuild +++ b/development/openjdk7/openjdk7.SlackBuild @@ -24,14 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cd $(dirname $0) ; CWD=$(pwd) - PRGNAM=openjdk7 VERSION=${VERSION:-7u321} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} DVER=1.7.0_$(printf $VERSION | cut -du -f2) -ICEDTEA=icedtea-2.6.28 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -52,6 +50,11 @@ SBO_PATCH_DIR="${BUILD_DIR}/jdk-archive-patch" PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +. $CWD/$PRGNAM.info || exit 1 +ICEDTEA=`echo $DOWNLOAD | awk '{print $1}' | awk -F / '{print $NF}'` +ANT=`echo $DOWNLOAD | awk '{print $9}' | awk -F / '{print $NF}'` +ANT_HOME=$BUILD_DIR/${ANT%-bin*} # this overrides the "official" ANT_HOME + if [ "$ARCH" = "x86_64" ]; then LIB_ARCH=amd64 LIBDIRSUFFIX="64" @@ -114,13 +117,14 @@ mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT cd $BUILD_DIR -tar -xvf $CWD/${ICEDTEA}.tar.xz +tar -xvf $CWD/${ANT} +tar -xvf $CWD/${ICEDTEA} mkdir icedtea-build cd icedtea-build # Set JAVA_HOME in order to avoid conflicts with other already installed JVMs. -JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH ../$ICEDTEA/configure \ +JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$ANT_HOME/bin:$PATH ../${ICEDTEA%.tar*}/configure \ --disable-docs \ --disable-downloading \ --with-jdk-home=${BOOT_JAVA} \ |