summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-03-19 15:44:49 +0100
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-03-19 15:44:49 +0100
commit17d80806588385e19089cfa9f5674607d79850b8 (patch)
tree12e7e1c475cea85711d9303f888f43b26aca33c6
parente61227ae03d8860d5a7a1acdcf73ae2bacf8251f (diff)
downloadjava-17d80806588385e19089cfa9f5674607d79850b8.tar.gz
java-17d80806588385e19089cfa9f5674607d79850b8.tar.xz
Version bump to openjdk9-1.9.0.110
-rw-r--r--exlibs/openjdk.exlib63
-rw-r--r--packages/dev-lang/openjdk9/openjdk9-1.9.0.110.exheres-0 (renamed from packages/dev-lang/openjdk9/openjdk9-1.9.0.93.exheres-0)2
2 files changed, 51 insertions, 14 deletions
diff --git a/exlibs/openjdk.exlib b/exlibs/openjdk.exlib
index a956c11..f271bac 100644
--- a/exlibs/openjdk.exlib
+++ b/exlibs/openjdk.exlib
@@ -26,16 +26,31 @@ HOMEPAGE="http://openjdk.java.net"
COMPONENTS=( corba hotspot jaxp jaxws jdk langtools nashorn )
BASE_URI="http://hg.openjdk.java.net"
-DOWNLOADS="
- ${BASE_URI}/${BRANCH}/${BRANCH}/archive/${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}.tar.bz2 -> ${PNV}.tar.bz2
- https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastStableBuild/artifact/jtreg${JTREG_VER}.tar.gz
-"
-
-for component in "${COMPONENTS[@]}"; do
- DOWNLOADS+="
- ${BASE_URI}/${BRANCH}/${BRANCH}/${component}/archive/${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}.tar.bz2 -> ${PNV}-${component}.tar.bz2
+if ! ever at_least 1.9.0.95 ; then
+ DOWNLOADS="
+ ${BASE_URI}/${BRANCH}/${BRANCH}/archive/${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}.tar.bz2 -> ${PNV}.tar.bz2
+ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastStableBuild/artifact/jtreg${JTREG_VER}.tar.gz
"
-done
+else
+ DOWNLOADS="
+ ${BASE_URI}/${BRANCH}/${BRANCH}/archive/${BRANCH/9/-9}+${JDK_BUILD}.tar.bz2 -> ${PNV}.tar.bz2
+ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastStableBuild/artifact/jtreg${JTREG_VER}.tar.gz
+ "
+fi
+
+if ! ever at_least 1.9.0.95 ; then
+ for component in "${COMPONENTS[@]}"; do
+ DOWNLOADS+="
+ ${BASE_URI}/${BRANCH}/${BRANCH}/${component}/archive/${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}.tar.bz2 -> ${PNV}-${component}.tar.bz2
+ "
+ done
+else
+ for component in "${COMPONENTS[@]}"; do
+ DOWNLOADS+="
+ ${BASE_URI}/${BRANCH}/${BRANCH}/${component}/archive/${BRANCH/9/-9}+${JDK_BUILD}.tar.bz2 -> ${PNV}-${component}.tar.bz2
+ "
+ done
+fi
if ever at_least 1.9.0 ; then
DOWNLOADS+="
@@ -100,7 +115,11 @@ DEPENDENCIES="
dev-lang/icedtea-web [[ description = [ Java browser plugin & Java Web Start ] ]]
"
-WORK=${WORKBASE}/${BRANCH}-${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}
+if ! ever at_least 1.9.0.95 ; then
+ WORK=${WORKBASE}/${BRANCH}-${BRANCH}${JDK_UPDATE}-b${JDK_BUILD}
+else
+ WORK=${WORKBASE}/${BRANCH}-${BRANCH/9/-9}+${JDK_BUILD}
+fi
openjdk_pkg_pretend() {
if ! ever at_least 1.9.0 && ! option bootstrap && ! has_version dev-lang/icedtea7 && ! has_version dev-lang/${PN} ; then
@@ -117,9 +136,15 @@ openjdk_pkg_pretend() {
openjdk_src_unpack() {
default
- for component in "${COMPONENTS[@]}"; do
- edo mv "${component}"-${BRANCH}${JDK_UPDATE}-b${JDK_BUILD} "${WORK}"/"${component}"
- done
+ if ! ever at_least 1.9.0.95 ; then
+ for component in "${COMPONENTS[@]}"; do
+ edo mv "${component}"-${BRANCH}${JDK_UPDATE}-b${JDK_BUILD} "${WORK}"/"${component}"
+ done
+ else
+ for component in "${COMPONENTS[@]}"; do
+ edo mv "${component}"-${BRANCH/9/-9}+${JDK_BUILD} "${WORK}"/"${component}"
+ done
+ fi
if expecting_tests --expensive ; then
edo mv jtreg "${WORK}"/
@@ -194,6 +219,10 @@ openjdk_src_configure() {
--with-zlib=system
)
+ if ever at_least 1.9.0.110 ; then
+ myconf+=( --with-cups=/usr/$(exhost --target) )
+ fi
+
if option bootstrap ; then
if ever at_least 1.9.0 ; then
myconf+=( --with-boot-jdk=${WORKBASE}/openjdk8 )
@@ -228,8 +257,16 @@ openjdk_src_compile() {
LOG=debug
)
+ if [[ ${PV} == 1.9.0.110 ]]; then
+ esandbox disable
+ fi
+
# The build system hates the -j parameter.
edo make "${myconf[@]}" all
+
+ if [[ ${PV} == 1.9.0.110 ]]; then
+ esandbox enable
+ fi
}
openjdk_src_test_expensive() {
diff --git a/packages/dev-lang/openjdk9/openjdk9-1.9.0.93.exheres-0 b/packages/dev-lang/openjdk9/openjdk9-1.9.0.110.exheres-0
index d9f4ef4..bbea5a5 100644
--- a/packages/dev-lang/openjdk9/openjdk9-1.9.0.93.exheres-0
+++ b/packages/dev-lang/openjdk9/openjdk9-1.9.0.110.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Wulf C. Krueger <philantrop@exherbo.org>
+# Copyright 2014-2016 Wulf C. Krueger <philantrop@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
BOOTSTRAP_VERSION="1.8.0.45"