summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-07-30 13:03:26 +0200
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-07-30 13:03:26 +0200
commit677c8006a7336ea7c36154fb6b205ba4f6d98706 (patch)
treec3f60a035e792ed1a81f2992903300fea442be27
parentd025d2400a8dcd0ac2a8726b10476cb113f91794 (diff)
downloadjava-677c8006a7336ea7c36154fb6b205ba4f6d98706.tar.gz
java-677c8006a7336ea7c36154fb6b205ba4f6d98706.tar.xz
Version bump to icedtea8-3.1.0
-rw-r--r--packages/dev-lang/icedtea8/icedtea8-3.1.0.exheres-0 (renamed from packages/dev-lang/icedtea8/icedtea8-3.0.1.exheres-0)4
-rw-r--r--packages/dev-lang/icedtea8/icedtea8.exlib149
2 files changed, 3 insertions, 150 deletions
diff --git a/packages/dev-lang/icedtea8/icedtea8-3.0.1.exheres-0 b/packages/dev-lang/icedtea8/icedtea8-3.1.0.exheres-0
index 9454e30..45761b0 100644
--- a/packages/dev-lang/icedtea8/icedtea8-3.0.1.exheres-0
+++ b/packages/dev-lang/icedtea8/icedtea8-3.1.0.exheres-0
@@ -5,7 +5,9 @@ REVISION=""
BOOTSTRAP_VERSION="2.5.4"
BOOTSTRAP_ANT_VERSION="1.8.2"
-require icedtea8
+SLOT="1.8"
+
+require icedtea
PLATFORMS="~amd64 ~x86"
diff --git a/packages/dev-lang/icedtea8/icedtea8.exlib b/packages/dev-lang/icedtea8/icedtea8.exlib
deleted file mode 100644
index 1ef2403..0000000
--- a/packages/dev-lang/icedtea8/icedtea8.exlib
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2009 Sterling X. Winter <replica@exherbo.org>
-# Copyright 2009-2016 Wulf C. Krueger <philantrop@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-SLOT="1.8"
-
-require icedtea
-export_exlib_phases src_configure src_compile
-
-WORK=${WORKBASE}/${PN/8}-${PV/_pre1/pre}
-
-if [[ -n ${REVISION} ]]; then
- BASE_URI="http://icedtea.classpath.org/hg/${PN}-forest"
-else
- BASE_URI="http://icedtea.wildebeest.org/download/drops/${PN}/$(ever range 1-3)"
-fi
-
-DOWNLOADS="
- ${BASE_URI}/openjdk.tar.xz -> openjdk-8-${PV}.tar.xz
- ${BASE_URI}/corba.tar.xz -> corba-${PV}.tar.xz
- ${BASE_URI}/jaxp.tar.xz -> jaxp-${PV}.tar.xz
- ${BASE_URI}/jaxws.tar.xz -> jaxws-${PV}.tar.xz
- ${BASE_URI}/jdk.tar.xz -> jdk-${PV}.tar.xz
- ${BASE_URI}/langtools.tar.xz -> langtools-${PV}.tar.xz
- ${BASE_URI}/nashorn.tar.xz -> nashorn-${PV}.tar.xz
- ${BASE_URI}/hotspot.tar.xz -> hotspot-${PV}.tar.xz
-
- bootstrap? (
- platform:amd64? (
- http://dev.exherbo.org/~philantrop/distfiles/${PN/8/7}-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/${PN/8/7}-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
- )
- )
-"
-# ${HOMEPAGE}/download/drops/hotspot/${HOTSPOT_TARBALL} -> openjdk-hotspot-${HOTSPOT_TARBALL}
-# cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )
-
-if [[ -n ${REVISION} ]]; then
- DOWNLOADS+="http://dev.exherbo.org/~philantrop/distfiles/${PNV}-${REVISION}.tar.xz"
- WORK=${WORKBASE}/${PNV}-${REVISION}
-#elif ever at_least 2.4.2 ; then
-# DOWNLOADS+="http://icedtea.wildebeest.org/download/source/${PN/8}-${PV/_pre1/pre}.tar.xz -> ${PNV}.tar.xz"
-else
- DOWNLOADS+="${HOMEPAGE}/download/source/${PN/8}-${PV/_pre1/pre}.tar.xz -> ${PNV}.tar.xz"
-fi
-
-DEPENDENCIES+="
- build+run:
- media-libs/lcms2[>=2.5]
- suggestion:
- dev-lang/icedtea-sound[>=1.0.1]
-"
-
-icedtea8_src_configure() {
- local myconf=(
- --enable-nss
- --enable-optimizations
- --enable-system-lcms
-# Having a bootstrap option but hard-disabling bootstrapping may look strange but
-# we're using a pre-compiled icedtea for bootstrapping whereas *this* bootstrap
-# switch is meant for using gcc[java]/gcj-jdk, iow: classpath, for bootstrapping
-# which we don't support anymore as it was a nightmare.
- --disable-bootstrap
- --disable-hg
- --with-hotspot-src-zip="${FETCHEDDIR}"/hotspot-${PV}.tar.xz
- --with-corba-src-zip="${FETCHEDDIR}"/corba-${PV}.tar.xz
- --with-jaxp-src-zip="${FETCHEDDIR}"/jaxp-${PV}.tar.xz
- --with-jaxws-src-zip="${FETCHEDDIR}"/jaxws-${PV}.tar.xz
- --with-jdk-src-zip="${FETCHEDDIR}"/jdk-${PV}.tar.xz
- --with-langtools-src-zip="${FETCHEDDIR}"/langtools-${PV}.tar.xz
- --with-nashorn-src-zip="${FETCHEDDIR}"/nashorn-${PV}.tar.xz
- --with-openjdk-src-zip="${FETCHEDDIR}"/openjdk-8-${PV}.tar.xz
- --with-parallel-jobs=${EXJOBS:-1}
- --with-pkgversion="Exherbo"
- )
-
- # We used to unset the Java variables here. This can cause build failures, though.
- # Instead, we're only doing it now during bootstrapping during which no existing
- # JDK should be used.
- # We do NOT export the Java variables here in case the user knows what he's
- # doing and has modified them.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- if option 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.
- unset JAVA_HOME CLASSPATH JAVAC JAVACMD
- export ANT_HOME=${WORKBASE}/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}/usr/share/ant
- export ANT=${WORKBASE}/apache-ant-bin-${BOOTSTRAP_ANT_VERSION}/usr/share/ant/bin/ant
- export JAVAC=${WORKBASE}/${PN}-${BOOTSTRAP_VERSION}/bin/javac
- export PATH=${WORKBASE}/${PN}-bin-${BOOTSTRAP_VERSION}/bin:${PATH}
- myconf+=(
- --with-jdk-home=${WORKBASE}/${PN/8/7}-${BOOTSTRAP_VERSION}
- --with-javac=${WORKBASE}/${PN/8/7}-${BOOTSTRAP_VERSION}/bin/javac
- --with-javah=${WORKBASE}/${PN/8/7}-${BOOTSTRAP_VERSION}/bin/javah
- --with-jar=${WORKBASE}/${PN/8/7}-${BOOTSTRAP_VERSION}/bin/jar
- --with-rmic=${WORKBASE}/${PN/8/7}-${BOOTSTRAP_VERSION}/bin/rmic
- )
- else
- if has_version dev-lang/icedtea6 ; then
- myconf+=( --with-jdk-home=/usr/$(exhost --target)/lib/icedtea6 )
- elif has_version dev-lang/icedtea7 ; then
- myconf+=( --with-jdk-home=/usr/$(exhost --target)/lib/icedtea7 )
- fi
- fi
-
-# if option cacao ; then
-# myconf+=" --with-cacao-home=/usr"
-# else
-# myconf+=" --without-cacao-home"
-# fi
-
- myconf+=( $(_icedtea_option doc docs) )
-# cacao
-# shark
-# zero
-
- # For some reason, icedtea8 really hates -march=native on x86.
- option platform:x86 && filter-flags -march=native
-
- econf ${myconf[@]}
-}
-
-icedtea8_src_compile() {
- unset JAVA_HOME CLASSPATH JAVAC JAVACMD
-
- # unset _JAVA_OPTIONS to avoid failures due to Java spouting crap:
- #
- # configure: Found potential Boot JDK using configure arguments
- # configure: Potential Boot JDK found at /var/tmp/paludis/build/dev-lang-icedtea8-3.0.1/work/icedtea-3.0.1/bootstrap/jdk1.7.0 is incorrect JDK version (Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true); ignoring
- # configure: (Your Boot JDK must be version 7 or 8)
- # configure: error: The path given by --with-boot-jdk does not contain a valid Boot JDK
- unset _JAVA_OPTIONS
-
- # The build system needs this dir but doesn't create it.
- edo mkdir -p "${WORK}"/bootstrap/boot/jre/lib
-
- # The icedtea8 build system uses the OPTIONS variable for setting defines.
- env -u OPTIONS emake DISTRIBUTION_PATCHES="${DISTRIBUTION_PATCHES[@]}" \
- ALT_OBJCOPY="/usr/$(exhost --target)/bin/$(exhost --tool-prefix)objcopy" \
- CXX=${CXX} NM=${NM} AR=${AR} READELF=$(exhost --tool-prefix)readelf \
- DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
-}
-