commit a9622001881e4c238f4d36fb3c87e5c1a929f4fc
Author: Jan Palus <at...@pld-linux.org>
Date: Thu Feb 10 23:31:33 2022 +0100
continue relying on $host for x32 detection
how is abi supposed to be part of cpu remains mystery
openjdk15.spec | 2 ++
x32.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
---
diff --git a/openjdk15.spec b/openjdk15.spec
index baf9cc6..b3c63d7 100644
--- a/openjdk15.spec
+++ b/openjdk15.spec
@@ -33,6 +33,7 @@ Source0:
https://github.com/openjdk/jdk15u/archive/jdk-%{version}-ga/%{name}-%{v
# Source0-md5: b6c79fe06be88736f3a642d37d7bfe71
Source10: make-cacerts.sh
Patch0: no_optflags.patch
+Patch1: x32.patch
URL: http://openjdk.java.net/
BuildRequires: /usr/bin/jar
BuildRequires: alsa-lib-devel
@@ -345,6 +346,7 @@ Przykłady dla OpenJDK.
%setup -qn jdk15u-jdk-%{version}-ga
%patch0 -p1
+%patch1 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..c860004
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,28 @@
+--- jdk12u-jdk-12.0.2-ga/make/autoconf/platform.m4.orig 2019-07-16
18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2-ga/make/autoconf/platform.m4 2022-02-10
23:23:27.419607985 +0100
+@@ -30,17 +30,19 @@
+ [
+ # First argument is the cpu name from the trip/quad
+ case "$1" in
+- x86_64*x32)
+- VAR_CPU=x32
+- VAR_CPU_ARCH=x86
+- VAR_CPU_BITS=32
+- VAR_CPU_ENDIAN=little
+- ;;
+ x86_64)
+ VAR_CPU=x86_64
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
++ case "$host" in
++ *x32)
++ VAR_CPU=x32
++ VAR_CPU_ARCH=x86
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=little
++ ;;
++ esac
+ ;;
+ i?86)
+ VAR_CPU=x86
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk15.git/commitdiff/33a8dd71ed3fa26a37e1f6eab905450786452972
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
