From: "Vlastimil Babka (caster)" <caster@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
Date: Fri, 18 Nov 2011 21:02:03 +0000 (UTC) [thread overview]
Message-ID: <20111118210203.BBCE02004B@flycatcher.gentoo.org> (raw)
caster 11/11/18 21:02:03
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it used only for ppc/ppc64. This functionality was experimental and brought more problems than benefits. Also remove the bootstrapping with cacao due to failures. Fixes numerous bugs.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.51 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 18 Nov 2011 18:11:15 -0000 1.50
+++ ChangeLog 18 Nov 2011 21:02:01 -0000 1.51
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.50 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $
+
+ 18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
+ used only for ppc/ppc64. This functionality was experimental and brought more
+ problems than benefits. Also remove the bootstrapping with cacao due to
+ failures. Fixes numerous bugs.
18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.15 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.14&r2=1.15
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.14
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:02:01 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.14 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -25,8 +25,6 @@
JAXWS_TARBALL="a2ebfdc9db7e.tar.gz"
JDK_TARBALL="2054526dd141.tar.gz"
LANGTOOLS_TARBALL="9b85f1265346.tar.gz"
-CACAO_TARBALL="4549072ab2de.tar.gz"
-JAMVM_TARBALL="310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz"
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
@@ -34,14 +32,13 @@
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )"
+ http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}"
HOMEPAGE="http://icedtea.classpath.org"
S=${WORKDIR}/${ICEDTEA_PKG}
# Missing options:
# shark - needs adding
-IUSE="debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart zero"
+IUSE="debug doc examples javascript +nsplugin pulseaudio systemtap +webstart"
RDEPEND=">=net-print/cups-1.2.12
>=x11-libs/libX11-1.1.3
@@ -63,7 +60,8 @@
x11-proto/xineramaproto
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
javascript? ( dev-java/rhino:1.6 )
- zero? ( virtual/libffi )
+ ppc? ( virtual/libffi )
+ ppc64? ( virtual/libffi )
>=x11-libs/libXrender-0.9.4
systemtap? ( >=dev-util/systemtap-1 )
!dev-java/icedtea:0
@@ -81,7 +79,6 @@
DEPEND="${RDEPEND}
|| (
>=dev-java/gcj-jdk-4.3
- >=dev-java/cacao-0.99.2
dev-java/icedtea-bin:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
@@ -107,19 +104,6 @@
JAVA_PKG_WANT_TARGET="1.5"
pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-# if use shark ; then
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild"
-# errror "without the shark USE flag turned on."
-# die "Rebuild without the shark USE flag on."
-# fi
-# if ( ! use zero ) ; then
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-# fi
-# fi
-
if use nsplugin && ! use webstart ; then
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
fi
@@ -151,8 +135,6 @@
JAVA_PKG_FORCE_VM="icedtea-bin-6"
elif has_version dev-java/gcj-jdk; then
JAVA_PKG_FORCE_VM="gcj-jdk"
- elif has_version dev-java/cacao; then
- JAVA_PKG_FORCE_VM="cacao"
else
die "Unable to find a supported VM for building"
fi
@@ -193,7 +175,7 @@
elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
# We can't currently bootstrap with a PaX enabled kernel :(
host-is-pax && config="${config} --disable-bootstrap"
- elif has "${vm}" gcj-jdk cacao; then
+ elif has "${vm}" gcj-jdk ; then
if host-is-pax; then
eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
eerror "Sorry for the inconvenience"
@@ -201,7 +183,7 @@
fi
else
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+ die "Install a GNU Classpath JDK (gcj-jdk)"
fi
# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -211,7 +193,7 @@
config="${config} --with-parallel-jobs=${procs}";
einfo "Configuring using --with-parallel-jobs=${procs}"
- if use_zero ; then
+ if need_zero ; then
config="${config} --enable-zero"
else
config="${config} --disable-zero"
@@ -221,15 +203,6 @@
rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
fi
-# CACAO disabled until it has OpenJDK7 support
-# if use cacao ; then
-# config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}";
-# fi
-
- if use jamvm ; then
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}";
- fi
-
unset_vars
econf ${config} \
@@ -246,7 +219,8 @@
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_with javascript rhino ${rhino_jar}) \
- $(use_enable zero) \
+ --disable-cacao \
+ --disable-jamvm \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap)
}
@@ -323,8 +297,8 @@
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
}
-use_zero() {
- use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+ ! use amd64 && ! use x86 && ! use sparc
}
pkg_preinst() {
1.8 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.7&r2=1.8
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.7
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:02:03 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.7 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -25,22 +25,18 @@
JAXWS_TARBALL="jdk6-jaxws-b20.zip"
JAF_TARBALL="jdk6-jaf-b20.zip"
HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
-CACAO_TARBALL="c7bf150bfa46.tar.gz"
-JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz"
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
- hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
- cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
+ hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )"
HOMEPAGE="http://icedtea.classpath.org"
S=${WORKDIR}/${ICEDTEA_PKG}
# Missing options:
# shark - needs adding
-IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero"
+IUSE="debug doc examples +hs20 javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender"
# JTReg doesn't pass at present
RESTRICT="test"
@@ -64,7 +60,8 @@
x11-proto/xineramaproto
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
javascript? ( dev-java/rhino:1.6 )
- zero? ( virtual/libffi )
+ ppc? ( virtual/libffi )
+ ppc64? ( virtual/libffi )
xrender? ( >=x11-libs/libXrender-0.9.4 )
systemtap? ( >=dev-util/systemtap-1 )
!dev-java/icedtea6
@@ -82,7 +79,6 @@
DEPEND="${RDEPEND}
|| (
( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
- ( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 )
dev-java/icedtea-bin:6
dev-java/icedtea:${SLOT}
)
@@ -113,19 +109,6 @@
JAVA_PKG_WANT_TARGET="1.5"
pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-# if use shark ; then
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild"
-# errror "without the shark USE flag turned on."
-# die "Rebuild without the shark USE flag on."
-# fi
-# if ( ! use zero ) ; then
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-# fi
-# fi
-
if use nsplugin && ! use webstart ; then
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
fi
@@ -151,8 +134,6 @@
JAVA_PKG_FORCE_VM="icedtea-bin-6"
elif has_version dev-java/gcj-jdk; then
JAVA_PKG_FORCE_VM="gcj-jdk"
- elif has_version dev-java/cacao; then
- JAVA_PKG_FORCE_VM="cacao"
else
die "Unable to find a supported VM for building"
fi
@@ -180,13 +161,13 @@
if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# If we are upgrading icedtea, then we don't need to bootstrap.
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
- elif has "${vm}" gcj-jdk cacao; then
- # For other 1.5 JDKs e.g. GCJ, CACAO.
+ elif has "${vm}" gcj-jdk; then
+ # For other 1.5 JDKs e.g. GCJ
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
config="${config} --with-jdk-home=${vmhome}"
else
eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+ die "Install a GNU Classpath JDK (gcj-jdk)"
fi
# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -196,7 +177,7 @@
config="${config} --with-parallel-jobs=${procs}";
einfo "Configuring using --with-parallel-jobs=${procs}"
- if use_zero ; then
+ if need_zero ; then
config="${config} --enable-zero"
else
config="${config} --disable-zero"
@@ -210,14 +191,6 @@
config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
fi
- if use cacao ; then
- config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
- fi
-
- if use jamvm ; then
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
- fi
-
unset_vars
econf ${config} \
@@ -229,8 +202,8 @@
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_with javascript rhino ${rhino_jar}) \
- $(use_enable cacao) \
- $(use_enable jamvm) \
+ --disable-cacao \
+ --disable-jamvm \
$(use_enable pulseaudio pulse-java) \
$(use_enable xrender) \
$(use_enable systemtap) \
@@ -303,8 +276,8 @@
set_java_env "${T}/icedtea.env"
}
-use_zero() {
- use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+ ! use amd64 && ! use x86 && ! use sparc
}
pkg_preinst() {
next reply other threads:[~2011-11-18 21:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-18 21:02 Vlastimil Babka (caster) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-21 11:40 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild Ralph Sennhauser (sera)
2011-11-18 22:00 Ralph Sennhauser (sera)
2011-11-18 21:18 Vlastimil Babka (caster)
2011-11-18 18:11 Ralph Sennhauser (sera)
2011-11-18 16:41 Vlastimil Babka (caster)
2011-11-18 11:01 Ralph Sennhauser (sera)
2011-11-10 21:42 Ralph Sennhauser (sera)
2011-11-08 19:01 Ralph Sennhauser (sera)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111118210203.BBCE02004B@flycatcher.gentoo.org \
--to=caster@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox