[packages/icedtea8] - rel 2; fix x32 patch

arekm arekm at pld-linux.org
Tue May 21 09:11:06 CEST 2019


commit 2c9e946f13aba072c648dc3c51baea721333d0fc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue May 21 09:10:51 2019 +0200

    - rel 2; fix x32 patch

 icedtea8-x32.patch | 27 +++++++++++++--------------
 icedtea8.spec      |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/icedtea8.spec b/icedtea8.spec
index 5785303..2f27208 100644
--- a/icedtea8.spec
+++ b/icedtea8.spec
@@ -32,7 +32,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea8
 Version:	3.12.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.wildebeest.org/download/source/icedtea-%{version}.tar.gz
diff --git a/icedtea8-x32.patch b/icedtea8-x32.patch
index 0e26552..f725650 100644
--- a/icedtea8-x32.patch
+++ b/icedtea8-x32.patch
@@ -40,20 +40,19 @@ diff -dur -x '*~' openjdk.orig/common/autoconf/platform.m4 openjdk/common/autoco
      x86_64*) ZERO_ARCHDEF=AMD64 ;;
      x86)     ZERO_ARCHDEF=IA32  ;;
      *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
-diff -dur -x '*~' openjdk.orig/common/autoconf/toolchain.m4 openjdk/common/autoconf/toolchain.m4
---- openjdk.orig/common/autoconf/toolchain.m4	2016-07-25 07:38:20.000000000 +0200
-+++ openjdk/common/autoconf/toolchain.m4	2016-09-21 09:03:56.592397163 +0200
-@@ -1026,6 +1026,10 @@
-         ppc )
-           # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
-           ;;
-+        x32 )
-+          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -DX32"
-+          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
-+          ;;
-         * )
-           COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
-           CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
+--- openjdk/common/autoconf/flags.m4~	2019-04-18 04:46:13.000000000 +0200
++++ openjdk/common/autoconf/flags.m4	2019-05-21 09:04:04.356004924 +0200
+@@ -482,6 +482,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAG
+       ppc )
+         # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
+         ;;
++       x32 )
++        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -DX32"
++        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
++        ;;
+       x86 )
+         CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
+         CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
 diff -dur -x '*~' openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
 --- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2016-09-20 13:22:05.697032126 +0200
 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2016-09-21 09:03:56.592397163 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea8.git/commitdiff/2c9e946f13aba072c648dc3c51baea721333d0fc



More information about the pld-cvs-commit mailing list