diff options
author | Eric Hameleers <alien@slackware.com> | 2013-02-12 20:36:13 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-02-12 20:36:13 +0000 |
commit | 8c15c0bb000e3a9cb13ae27ba8a56cc7117d74e4 (patch) | |
tree | d1addb62065677bc2c1a52a9de72d8801c806417 /openjdk | |
parent | 241713e8ce8c8c6bb0a9999030ffc3297bc5fc72 (diff) | |
download | asb-8c15c0bb000e3a9cb13ae27ba8a56cc7117d74e4.tar.gz asb-8c15c0bb000e3a9cb13ae27ba8a56cc7117d74e4.tar.xz |
Update to icedtea-2.3.6 which builds Java 7u13_b20
Diffstat (limited to 'openjdk')
-rw-r--r-- | openjdk/build/BUILDING.txt | 20 | ||||
-rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 13 |
2 files changed, 19 insertions, 14 deletions
diff --git a/openjdk/build/BUILDING.txt b/openjdk/build/BUILDING.txt index a7cbe8ff..664452d2 100644 --- a/openjdk/build/BUILDING.txt +++ b/openjdk/build/BUILDING.txt @@ -1,23 +1,23 @@ # You can run this script in the sources/ subdirectory to download the sources. -# For icedtea-2.3.4 the tarballs are: -wget http://icedtea.classpath.org/download/source/icedtea-2.3.4.tar.gz +# For icedtea-2.3.6 the tarballs are: +wget http://icedtea.classpath.org/download/source/icedtea-2.3.6.tar.gz # # These source URLs are constructed from reading the Makefile.in of icedtea: # egrep '(^OPENJDK_VERSION|^JDK_UPDATE_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_PREFIX|^ICEDTEA_HG_URL)' Makefile.in # -# In icedtea-2.3.4 you can choose between "default" and "zero" versions +# In icedtea-2.3.6 you can choose between "default" and "zero" versions # of the VM. The zero vm is meant for ARM based systems. # Use this command to find out the hash of the hopspot.zip # grep default hotspot.map # -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/8bd8e70d4a03.tar.gz -O openjdk.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/dc9234e25ab0.tar.gz -O corba.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/aa3654afea12.tar.gz -O jaxp.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/96d4f04f2b7c.tar.gz -O jdk.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/946195011b30.tar.gz -O langtools.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/beecf0b9e760.tar.gz -O hotspot.tar.gz -wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/7182233cc27e.tar.gz -O jaxws.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/dd8d1a8f222f.tar.gz -O openjdk.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/97a8b625f6e9.tar.gz -O corba.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d7feafb8427b.tar.gz -O jaxp.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/6bb01322bb5a.tar.gz -O jdk.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/e0739a8783d1.tar.gz -O langtools.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/bc0de5a0ece2.tar.gz -O hotspot.tar.gz +wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b900024eb4ba.tar.gz -O jaxws.tar.gz wget http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz -O cacao-a567bcb7f589.tar.gz wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index 9ce63bf0..fa9f7de6 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -23,12 +23,12 @@ PKGNAM1=openjdk PKGNAM2=openjre -JAVAVER=7u9 -JAVABLD=b30 -ICEDTEA=2.3.4 +JAVAVER=7u13 +JAVABLD=b20 +ICEDTEA=2.3.6 VERSION="${JAVAVER}_${JAVABLD}" -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-"alien"} NUMJOBS=${NUMJOBS:--j6} @@ -114,6 +114,11 @@ cd $TMP rm -rf icedtea-$ICEDTEA tar xvf $CWD/sources/icedtea-$ICEDTEA.tar.?z* || exit 1 cd icedtea-$ICEDTEA || exit 1 + +# Fix Zero compilation, permanent fix will be in icedtea-2.3.5: +cat $SRCDIR/patches/icedtea_zero_buildfix.patch | patch -p1 --verbose \ + 2>&1 $OUTPUT/patch-${PRGNAM}.log + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |