commit dd22ff85169ce252ee7629346940c6ae411a9b6c
Author: Jan Palus <[email protected]>
Date: Wed Nov 24 21:59:01 2021 +0100
force locking during build
see
https://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2021-November/026415.html
ignore-java-options.patch | 11 +++++++++++
openjdk8.spec | 6 ++++++
2 files changed, 17 insertions(+)
---
diff --git a/openjdk8.spec b/openjdk8.spec
index a4aa4f2..256d97c 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -57,6 +57,7 @@ Patch10: link-with-as-needed.patch
Patch11: aarch32.patch
Patch12: atomic.patch
Patch13: hotspot-disable-werror.patch
+Patch14: ignore-java-options.patch
URL: http://openjdk.java.net/
BuildRequires: /usr/bin/jar
BuildRequires: alsa-lib-devel
@@ -453,6 +454,7 @@ done
%patch12 -p1
%endif
%patch13 -p1
+%patch14 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -464,6 +466,10 @@ fi
unset JAVA_HOME
unset CLASSPATH
+# force locking irrespective of cpu count determined based on /proc and /sys
contents
+#
https://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2021-November/026415.html
+export _JAVA_OPTIONS=-XX:+AssumeMP
+
mkdir -p build-bin
export PATH="$(pwd)/build-bin:$PATH"
diff --git a/ignore-java-options.patch b/ignore-java-options.patch
new file mode 100644
index 0000000..1c4fd11
--- /dev/null
+++ b/ignore-java-options.patch
@@ -0,0 +1,11 @@
+--- jdk8u-jdk8u312-ga/common/autoconf/boot-jdk.m4.orig 2021-09-14
01:27:07.000000000 +0200
++++ jdk8u-jdk8u312-ga/common/autoconf/boot-jdk.m4 2021-11-24
21:50:44.335912643 +0100
+@@ -51,7 +51,7 @@
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK.
Is it the correct version?
+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v
_JAVA_OPTIONS | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk8.git/commitdiff/dd22ff85169ce252ee7629346940c6ae411a9b6c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
