diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-09-17 14:42:49 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-09-17 14:43:04 -0700 |
| commit | cc5c9e638e2f70f2ae217fa0d02d7b4a6b94eea2 (patch) | |
| tree | 650cb722b52b98d40fa22b4ba5783eb23d42d39f | |
| parent | media-sound/spotify: 1.1.42 bump (diff) | |
| download | gentoo-cc5c9e63.tar.gz gentoo-cc5c9e63.tar.bz2 gentoo-cc5c9e63.zip | |
dev-java/openjdk: tweak unpack & prepare phases
by building forest tructure before src_prepare
allows us to apply patches easier and allows users
to use /etc/portage/patches with default paths.
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
| -rw-r--r-- | dev-java/openjdk/openjdk-8.265_p01.ebuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild index cc033b9fde99..5101407a542d 100644 --- a/dev-java/openjdk/openjdk-8.265_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild @@ -122,15 +122,16 @@ pkg_setup() { src_unpack() { default - mv -v "jdk${SLOT}u"* "${S}" || die -} + mv -v "jdk${SLOT}u"* "${P}" || die -src_prepare() { - default local repo for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do - mv -v ../"${repo}-"* "${repo}" || die + mv -v "${repo}-"* "${P}/${repo}" || die done +} + +src_prepare() { + default # new warnings in new gcc https://bugs.gentoo.org/685426 sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ @@ -210,7 +211,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - # stupid build system does not remove that + # build system does not remove that if use headless-awt ; then rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ {,jre/}bin/policytool bin/appletviewer || die |