summaryrefslogtreecommitdiffstats
path: root/openjdk7
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-01-01 16:35:47 +0000
committer Eric Hameleers <alien@slackware.com>2019-01-01 16:35:47 +0000
commitb73cba95726ddb1a4f99bfdcca14afd9dd9d1537 (patch)
tree3e58d74c2f1ff86229be4df161641cc1a932dcf1 /openjdk7
parent6537282cb3272db46212357f3e55db5fe28bad31 (diff)
downloadasb-b73cba95726ddb1a4f99bfdcca14afd9dd9d1537.tar.gz
asb-b73cba95726ddb1a4f99bfdcca14afd9dd9d1537.tar.xz
openjdk7: updated to OpenJDK update 191 build 02 (icedtea-2.6.15)
Diffstat (limited to 'openjdk7')
-rw-r--r--openjdk7/build/BUILDING.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/openjdk7/build/BUILDING.txt b/openjdk7/build/BUILDING.txt
index 266a239e..9222fef9 100644
--- a/openjdk7/build/BUILDING.txt
+++ b/openjdk7/build/BUILDING.txt
@@ -2,8 +2,10 @@
# -----------------------------------------------------------------------------
#
-# These source URLs are constructed from reading the Makefile.in of icedtea:
-# egrep '(^OPENJDK_VERSION|^JDK_UPDATE_VERSION|^BUILD_VERSION|^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_MAJOR|^ICEDTEA_BRANCH|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL|^DROP_URL)' Makefile.in
+# These source URLs are constructed from reading the
+# acinclude.m4 and Makefile.in of icedtea:
+# egrep '(^JDK_UPDATE_VERSION|^BUILD_VERSION)' acinclude.m4
+# egrep '(^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_MAJOR|^ICEDTEA_BRANCH|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL|^DROP_URL)' Makefile.in
#
# In icedtea you can choose between "default" and "zero" versions
# of the VM. The zero vm is meant for ARM based systems.
@@ -14,8 +16,8 @@
# Check ICEDTEA_BRANCH value in Makefile.in:
ICEDTEA_MAJOR="icedtea7"
-ICEDTEA_BRANCH="2.6.14"
-ICEDTEA_VERSION="2.6.14"
+ICEDTEA_BRANCH="2.6.15"
+ICEDTEA_VERSION="2.6.15"
DROPURL="http://icedtea.classpath.org/download/drops"
SUPPURL="${DROPURL}/${ICEDTEA_MAJOR}/${ICEDTEA_BRANCH}"
@@ -23,8 +25,9 @@ SUPPURL="${DROPURL}/${ICEDTEA_MAJOR}/${ICEDTEA_BRANCH}"
wget -c http://icedtea.classpath.org/download/source/icedtea-${ICEDTEA_VERSION}.tar.xz
wget -c http://icedtea.classpath.org/download/source/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-# Extract Makefile.in:
+# Extract Makefile.in and acinclude.m4:
tar -O -xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/Makefile.in > Makefile.in
+tar -O -xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/acinclude.m4 > acinclude.m4
# Get supporting sources:
wget ${SUPPURL}/openjdk.tar.bz2 -O openjdk_icedtea-${ICEDTEA_VERSION}.tar.bz2
@@ -48,8 +51,8 @@ wget ${DROPURL}/jamvm/jamvm-${JAMVM_HASH}.tar.gz -O jamvm_icedtea-${ICEDTEA_VERS
echo ==========================================================================
gpg --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig 2>&1 |grep -e "^gpg: .* signature from"
echo ""
-JDKU=$(grep ^JDK_UPDATE_VERSION Makefile.in | tr -d ' ' | cut -f2 -d=)
-JDKB=$(grep ^BUILD_VERSION Makefile.in | 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 "** Icedtea ${ICEDTEA_VERSION} will build OpenJDK update $JDKU build $JDKB"
echo ==========================================================================