diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-08-05 17:17:12 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-08-05 17:17:12 -0400 |
| commit | 85cf03d64b8fb23ad0df5e2ad23095177f6ffebf (patch) | |
| tree | f2e9c1ee8f9eb50ca76026154d87e9c1f353bd0e /dev-java | |
| parent | c7c4fcff0eca356dbfe28e08a5844d8f3a3426bf (diff) | |
| download | gentoo-overlay-85cf03d64b8fb23ad0df5e2ad23095177f6ffebf.tar.xz gentoo-overlay-85cf03d64b8fb23ad0df5e2ad23095177f6ffebf.zip | |
dev-java/openj9-openjdk: remove fcommon patch
wait for 11.0.9, 15
Diffstat (limited to 'dev-java')
3 files changed, 2 insertions, 49 deletions
diff --git a/dev-java/openj9-openjdk/files/openjdk-8238380-childproc-fcommon.patch b/dev-java/openj9-openjdk/files/openjdk-8238380-childproc-fcommon.patch deleted file mode 100644 index a972bc6..0000000 --- a/dev-java/openj9-openjdk/files/openjdk-8238380-childproc-fcommon.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# HG changeset patch -# User qpzhang -# Date 1580822830 -28800 -# Node ID 6925fca959590dd0f747a9cffa5f0664ec02c7b1 -# Parent 8f6ffa575f63db3f07f96e52c97883fbaff459b4 -8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10 -Reviewed-by: stuefe, clanger, rriggs -Contributed-by: patrick@os.amperecomputing.com - -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c ---- a/src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800 -+++ b/src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -34,6 +34,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h ---- a/src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800 -+++ b/src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -126,7 +126,7 @@ - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); - 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 4aa72e0..dee8e06 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 @@ -158,7 +158,6 @@ src_prepare() { default - eapply "${FILESDIR}/openjdk-8238380-childproc-fcommon.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" @@ -202,6 +201,7 @@ src_configure() { --with-extra-cflags="${CFLAGS}" --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" + --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system 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 4f425a7..48a910c 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 @@ -203,6 +203,7 @@ src_configure() { --with-extra-cflags="${CFLAGS}" --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" + --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system |