summaryrefslogtreecommitdiff
path: root/dev-java/openj9-openjdk
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2020-08-01 15:26:55 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2020-08-01 15:26:55 -0400
commit75b9ca1025ba889904f106d4baf6f190c0a52832 (patch)
tree7a23fda015f917c5df7ee81850c4bb79610071ea /dev-java/openj9-openjdk
parentb46544b8dfb1e033ed639ef7b71083f282f22cce (diff)
downloadgentoo-overlay-75b9ca1025ba889904f106d4baf6f190c0a52832.tar.xz
gentoo-overlay-75b9ca1025ba889904f106d4baf6f190c0a52832.zip
dev-java/openj9-openjdk: cleanup
Diffstat (limited to 'dev-java/openj9-openjdk')
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild22
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild24
2 files changed, 20 insertions, 26 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
index 0960297..f898553 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
@@ -155,22 +155,18 @@ pkg_setup() {
src_prepare() {
ln -s ../openj9-${OPENJ9_P} openj9 || die
ln -s ../openj9-omr-${OPENJ9_P} omr || die
+
default
+
eapply "${FILESDIR}/openjdk-8238380-childproc-fcommon.patch"
- (
- cd openj9 || die
- #eapply "${FILESDIR}/openj9-j9utf8-fam.patch"
- eapply "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
- )
- (
- cd omr || die
- eapply "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
- #eapply "${FILESDIR}/omr-fam.patch"
- )
+ eapply -d openj9 -- "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
+ #eapply -d openj9 -- "${FILESDIR}/openj9-j9utf8-fam.patch"
+ eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
+ #eapply -d omr -- "${FILESDIR}/omr-fam.patch"
sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk
+ -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
+ -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
+ closed/OpenJ9.gmk
chmod +x configure || die
}
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
index a8c5017..6aa0dee 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
@@ -155,21 +155,19 @@ pkg_setup() {
src_prepare() {
ln -s ../openj9-${OPENJ9_P} openj9 || die
ln -s ../openj9-omr-${OPENJ9_P} omr || die
+
default
- (
- cd openj9 || die
- #eapply "${FILESDIR}/openj9-j9utf8-fam.patch"
- eapply "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
- )
- (
- cd omr || die
- eapply "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
- #eapply "${FILESDIR}/omr-fam.patch"
- )
+
+ eapply -d openj9 -- "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
+ #eapply -d openj9 -- "${FILESDIR}/openj9-j9utf8-fam.patch"
+ eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
+ #eapply -d omr -- "${FILESDIR}/omr-fam.patch"
+
sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk
+ -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
+ -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
+ closed/OpenJ9.gmk
+
chmod +x configure || die
}