|
Line 0
Link Here
|
|
|
1 |
Taken from http://hg.openjdk.java.net/icedtea/jdk7/jdk/raw-rev/e46d527097f1 |
| 2 |
and paths adjusted to match icedtea unpacked source tree. |
| 3 |
|
| 4 |
2011-09-22 Martin von Gagern |
| 5 |
|
| 6 |
References: |
| 7 |
- https://bugs.gentoo.org/383737 |
| 8 |
|
| 9 |
# HG changeset patch |
| 10 |
# User andrew |
| 11 |
# Date 1312327987 -3600 |
| 12 |
# Node ID e46d527097f175065b6454a306db52cbf5a8884b |
| 13 |
# Parent ccf86bbc61fd717f83dbee5a246e903b5d23306b |
| 14 |
G356743: Support building against libpng 1.5. |
| 15 |
|
| 16 |
--- a/openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Fri Jul 29 16:00:32 2011 -0400 |
|
Lines 9-15
Link Here
|
| 9 |
|
9 |
|
| 10 |
EAPI="2" |
10 |
EAPI="2" |
| 11 |
|
11 |
|
| 12 |
inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator |
12 |
inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator eutils |
| 13 |
|
13 |
|
| 14 |
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" |
14 |
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" |
| 15 |
SLOT="7" |
15 |
SLOT="7" |
|
Lines 244-249
Link Here
|
| 244 |
$(use_enable xrender) \ |
244 |
$(use_enable xrender) \ |
| 245 |
$(use_enable systemtap) \ |
245 |
$(use_enable systemtap) \ |
| 246 |
|| die "configure failed" |
246 |
|| die "configure failed" |
|
|
247 |
|
| 248 |
# Theoretically, extraction should go into src_unpack, but as we |
| 249 |
# need to configure first, that's not an option. Next expected place |
| 250 |
# might be src_compile, but adding it there would not allow users a |
| 251 |
# look at the unpacked and patched source tree without triggering |
| 252 |
# the build. So we extract here, even if this is not really a |
| 253 |
# configuration step in the strict sense. |
| 254 |
emake -j 1 extract || die "extract failed" |
| 255 |
epatch "${FILESDIR}"/7.1.14-libpng15.patch |
| 256 |
epatch_user |
| 247 |
} |
257 |
} |
| 248 |
|
258 |
|
| 249 |
src_compile() { |
259 |
src_compile() { |
|
Lines 255-260
Link Here
|
| 255 |
# otherwise we try to load the least that's needed to avoid possible classpath collisions |
265 |
# otherwise we try to load the least that's needed to avoid possible classpath collisions |
| 256 |
export ANT_TASKS="xerces-2 xalan ant-nodeps" |
266 |
export ANT_TASKS="xerces-2 xalan ant-nodeps" |
| 257 |
|
267 |
|
|
|
268 |
export DISABLE_HOTSPOT_OS_VERSION_CHECK=ok # bug 382741 |
| 269 |
|
| 258 |
# Paludis does not respect unset from src_configure |
270 |
# Paludis does not respect unset from src_configure |
| 259 |
unset_vars |
271 |
unset_vars |
| 260 |
emake -j 1 || die "make failed" |
272 |
emake -j 1 || die "make failed" |
