Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 272023 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/layman/java-overlay/dev-java/icedtea/icedtea-1.10.ebuild (-17 / +27 lines)
Lines 1-21 Link Here
1
# Copyright 1999-2009 Gentoo Foundation
1
# Copyright 1999-2009 Gentoo Foundation
2
# Build written by Andrew John Hughes
2
# Build written by Andrew John Hughes
3
# Edited by Ruediger Gad
3
# Distributed under the terms of the GNU General Public License v2
4
# Distributed under the terms of the GNU General Public License v2
4
# $Header: $
5
# $Header: $
5
6
6
EAPI="2"
7
EAPI="2"
7
8
8
inherit autotools pax-utils java-pkg-2 java-vm-2
9
inherit autotools pax-utils java-pkg-2 java-vm-2 flag-o-matic
9
10
10
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
11
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
11
OPENJDK_TARBALL="0d76c4da605f.tar.gz"
12
OPENJDK_TARBALL="e7eeeda332ec.tar.gz"
12
LANGTOOLS_TARBALL="0f653be1a42f.tar.gz"
13
LANGTOOLS_TARBALL="634f519d6f9a.tar.gz"
13
JAXP_TARBALL="748976d69503.tar.gz"
14
JAXP_TARBALL="b3d2bf4c255d.tar.gz"
14
JAXWS_TARBALL="faac46e2e60f.tar.gz"
15
JAXWS_TARBALL="c37936a72332.tar.gz"
15
CORBA_TARBALL="e9ba2b962ddf.tar.gz"
16
CORBA_TARBALL="1741ea5cb854.tar.gz"
16
JDK_TARBALL="3d024b86523a.tar.gz"
17
JDK_TARBALL="51fcc41d8b24.tar.gz"
17
HOTSPOT_TARBALL="aa0c48844632.tar.gz"
18
HOTSPOT_TARBALL="945fcffdbcab.tar.gz"
18
CACAO_TARBALL="cacao-0.99.4.tar.gz"
19
CACAO_TARBALL="cacao-0.99.4.tar.gz"
20
19
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz
21
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz
20
		 http://hg.openjdk.java.net/icedtea/jdk7/archive/${OPENJDK_TARBALL}
22
		 http://hg.openjdk.java.net/icedtea/jdk7/archive/${OPENJDK_TARBALL}
21
		 http://hg.openjdk.java.net/icedtea/jdk7/corba/archive/${CORBA_TARBALL}
23
		 http://hg.openjdk.java.net/icedtea/jdk7/corba/archive/${CORBA_TARBALL}
Lines 36-43 Link Here
36
RESTRICT="test"
38
RESTRICT="test"
37
39
38
LICENSE="GPL-2-with-linking-exception"
40
LICENSE="GPL-2-with-linking-exception"
39
SLOT="7"
41
SLOT="0"
40
#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
42
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
41
43
42
RDEPEND=">=net-print/cups-1.2.12
44
RDEPEND=">=net-print/cups-1.2.12
43
	 >=x11-libs/libX11-1.1.3
45
	 >=x11-libs/libX11-1.1.3
Lines 101-112 Link Here
101
103
102
	# quite a hack since java-config does not provide a way for a package
104
	# quite a hack since java-config does not provide a way for a package
103
	# to limit supported VM's for building and their preferred order
105
	# to limit supported VM's for building and their preferred order
104
	if has_version dev-java/icedtea6; then
106
	# Pull icedtea in front in order to build icedtea with itself instead of
107
	# with icedtea6 in case we have icedtea already installed.
108
	if has_version dev-java/icedtea; then
109
	        JAVA_PKG_FORCE_VM="icedtea"
110
	elif has_version dev-java/icedtea6; then
105
		JAVA_PKG_FORCE_VM="icedtea6"
111
		JAVA_PKG_FORCE_VM="icedtea6"
106
	elif has_version dev-java/icedtea6-bin; then
112
	elif has_version dev-java/icedtea6-bin; then
107
		JAVA_PKG_FORCE_VM="icedtea6-bin"
113
		JAVA_PKG_FORCE_VM="icedtea6-bin"
108
	elif has_version dev-java/icedtea; then
109
		JAVA_PKG_FORCE_VM="icedtea"
110
	elif has_version dev-java/gcj-jdk; then
114
	elif has_version dev-java/gcj-jdk; then
111
		JAVA_PKG_FORCE_VM="gcj-jdk"
115
		JAVA_PKG_FORCE_VM="gcj-jdk"
112
	elif has_version dev-java/cacao; then
116
	elif has_version dev-java/cacao; then
Lines 134-142 Link Here
134
	local vmhome="/usr/lib/jvm/${vm}"
138
	local vmhome="/usr/lib/jvm/${vm}"
135
139
136
	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
140
	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
137
		# If we are upgrading icedtea, then we don't need to bootstrap.
141
		config="${config} --disable-bootstrap"
138
		config="${config} --with-icedtea"
139
		config="${config} --with-icedtea-home=$(java-config -O)"
140
	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
142
	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
141
		# For other 1.5 JDKs e.g. GCJ, CACAO.
143
		# For other 1.5 JDKs e.g. GCJ, CACAO.
142
		config="${config} --with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar)" \
144
		config="${config} --with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar)" \
Lines 166-171 Link Here
166
168
167
	unset_vars
169
	unset_vars
168
170
171
	# Filtering of CFLAGS is necessary at least here for building (using gcc 4.3.3-r2 
172
	# on x86_64). The build error happens in the JAX-WS component and is caused
173
	# because of compilation with -Werror which seems to be "hard coded"
174
	# somewhere.
175
	export ALLOWED_FLAGS="-march -pipe"
176
	strip-flags
177
	filter-flags -O*
178
	einfo "Using CFLAGS: ${CFLAGS}"
179
169
	econf ${config} \
180
	econf ${config} \
170
		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
181
		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
171
		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
182
		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
Lines 225-231 Link Here
225
	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
236
	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
226
237
227
	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
238
	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
228
	dohtml README.html || die
229
239
230
	if use examples; then
240
	if use examples; then
231
		dodir "${dest}/share";
241
		dodir "${dest}/share";

Return to bug 272023