summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-07-30 17:51:01 +0200
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-07-31 12:42:12 +0200
commit56d5386c5feaaae26553b25c56aebcde54d876cb (patch)
tree0febb115a8ef67f6ebfc272808a55fdb30ad3765
parent2821d5d708d2cda9e7a4241dbd3e40acca9960d6 (diff)
downloadjava-56d5386c5feaaae26553b25c56aebcde54d876cb.tar.gz
java-56d5386c5feaaae26553b25c56aebcde54d876cb.tar.xz
icedtea.exlib: Drop the bootstrap option, use auto-bootstrapping
Change-Id: Ia1c73f87587e781a61548eddfc6fb10fe6a2b959 Reviewed-on: https://galileo.mailstation.de/gerrit/6789 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
-rw-r--r--exlibs/icedtea.exlib65
1 files changed, 20 insertions, 45 deletions
diff --git a/exlibs/icedtea.exlib b/exlibs/icedtea.exlib
index b59197c..f3dce52 100644
--- a/exlibs/icedtea.exlib
+++ b/exlibs/icedtea.exlib
@@ -7,7 +7,7 @@ require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.
java-jdk \
flag-o-matic
-export_exlib_phases pkg_pretend src_unpack src_configure src_compile src_test_expensive src_install pkg_preinst
+export_exlib_phases pkg_setup src_unpack src_configure src_compile src_test_expensive src_install pkg_preinst
SUMMARY="IcedTea allows for building OpenJDK without any non-free components"
DESCRIPTION="
@@ -28,10 +28,6 @@ DEPENDENCIES="
build:
app-arch/unzip
app-arch/zip
- !bootstrap? (
- dev-java/apache-ant[>=1.6.5]
- dev-lang/${PN}
- )
build+run:
app-misc/ca-certificates
dev-libs/atk
@@ -59,16 +55,13 @@ DEPENDENCIES="
x11-libs/pango
providers:ijg-jpeg? ( media-libs/jpeg:=[>=7] )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
+ recommendation:
+ dev-java/apache-ant[>=1.6.5]
suggestion:
dev-lang/icedtea-web [[ description = [ Java browser plugin & Java Web Start ] ]]
"
-if ! ever at_least 3.0 ; then
- DEPENDENCIES+="
- build+run:
- javascript? ( dev-java/rhino )
- "
-else
+if ever at_least 3.0 ; then
DEPENDENCIES+="
build+run:
media-libs/lcms2[>=2.5]
@@ -84,19 +77,6 @@ MYOPTIONS="
( platform: amd64 x86 )
"
-if ! ever at_least 3.0 ; then
- MYOPTIONS+="
- bootstrap [[ description = [ Bootstrap ${PN} with a pre-compiled binary rather than an already
- installed ${PN}. ] requires = [ -javascript ] ]]
- javascript [[ description = [ Build the JavaScript 1.5 compatible Rhino engine ] ]]
- "
-else
- MYOPTIONS+="
- bootstrap [[ description = [ Bootstrap ${PN} with a pre-compiled binary rather than an already
- installed ${PN}. ] ]]
- "
-fi
-
if [[ -n ${REVISION} ]]; then
BASE_URI="http://icedtea.classpath.org/hg/${PN}-forest"
else
@@ -118,15 +98,13 @@ DOWNLOADS="
${BASE_URI}/langtools.tar.${ARC_EXT} -> langtools-${PV}.tar.${ARC_EXT}
${BASE_URI}/hotspot.tar.${ARC_EXT} -> hotspot-${PV}.tar.${ARC_EXT}
- bootstrap? (
- platform:amd64? (
- http://dev.exherbo.org/~philantrop/distfiles/icedtea7-bin-${BOOTSTRAP_VERSION}-amd64.tar.xz -> ${PN}-bin-${BOOTSTRAP_VERSION}-amd64.tar.xz
- http://dev.exherbo.org/~philantrop/distfiles/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-amd64.tar.bz2
- )
- platform:x86? (
- http://dev.exherbo.org/~philantrop/distfiles/icedtea7-bin-${BOOTSTRAP_VERSION}-x86.tar.xz -> ${PN}-bin-${BOOTSTRAP_VERSION}-x86.tar.xz
- http://dev.exherbo.org/~philantrop/distfiles/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-x86.tar.bz2
- )
+ platform:amd64? (
+ http://dev.exherbo.org/~philantrop/distfiles/icedtea7-bin-${BOOTSTRAP_VERSION}-amd64.tar.xz -> ${PN}-bin-${BOOTSTRAP_VERSION}-amd64.tar.xz
+ http://dev.exherbo.org/~philantrop/distfiles/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-amd64.tar.bz2
+ )
+ platform:x86? (
+ http://dev.exherbo.org/~philantrop/distfiles/icedtea7-bin-${BOOTSTRAP_VERSION}-x86.tar.xz -> ${PN}-bin-${BOOTSTRAP_VERSION}-x86.tar.xz
+ http://dev.exherbo.org/~philantrop/distfiles/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-x86.tar.bz2
)
"
@@ -162,11 +140,12 @@ _icedtea_option() {
fi
}
-icedtea_pkg_pretend() {
- if ! option bootstrap && ! has_version dev-lang/icedtea7 && ! has_version dev-lang/icedtea8 ; then
- ewarn "You need ${PN} installed to compile ${PN} from source."
- ewarn "Try installing ${PN}[bootstrap]"
- die "Could not find ${PN} to bootstrap with"
+icedtea_pkg_setup() {
+ if ! has_version dev-lang/icedtea7 && ! has_version dev-lang/icedtea8 && ! has_version dev-java/apache-ant ; then
+ MUST_BOOTSTRAP=1
+ einfo "Auto-bootstrapping ${PN}"
+ else
+ unset MUST_BOOTSTRAP
fi
}
@@ -177,10 +156,10 @@ icedtea_src_unpack() {
unpack ${PNV}.tar.xz
fi
- if option platform:amd64 && option bootstrap ; then
+ if option platform:amd64 && [[ -n ${MUST_BOOTSTRAP} ]] ; then
unpack ${PN}-bin-${BOOTSTRAP_VERSION}-amd64.tar.xz
unpack apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-amd64.tar.bz2
- elif option platform:x86 && option bootstrap ; then
+ elif option platform:x86 && [[ -n ${MUST_BOOTSTRAP} ]] ; then
unpack ${PN}-bin-${BOOTSTRAP_VERSION}-x86.tar.xz
unpack apache-ant-bin-${BOOTSTRAP_ANT_VERSION}-x86.tar.bz2
fi
@@ -228,7 +207,7 @@ icedtea_src_configure() {
# doing and has modified them.
export ANT_RESPECT_JAVA_HOME=TRUE
- if option bootstrap ; then
+ if [[ -n ${MUST_BOOTSTRAP} ]] ; then
# Unset the Java variables in order to make sure no existing JDK gets picked
# up. We DO have to set JAVAC explicitly, though, or ecj.jar (which we don't
# usually provide) will be required.
@@ -253,11 +232,7 @@ icedtea_src_configure() {
fi
if ! ever at_least 3.0 ; then
- if option javascript ; then
- myconf+=( --with-rhino=/usr/share/rhino/js.jar )
- else
myconf+=( --without-rhino )
- fi
fi
myconf+=( $(_icedtea_option doc docs) )