rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch paths to pass git apply

Browse Source
This commit is contained in:
Andrew John Hughes 2018-12-19 04:11:48 +00:00
parent 0bd5dd84cd
commit f5121c69ba
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-1.8.0-openjdk.spec
View File

@ -970,7 +970,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 12%{?dist} Release: 13%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -2347,6 +2347,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Wed Dec 19 2018 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.191.b12-13
- Fix jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch paths to pass git apply
* Mon Dec 10 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.191.b12-12 * Mon Dec 10 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.191.b12-12
- adde fx link of libglassgtk2.so (rhbz1657485) - adde fx link of libglassgtk2.so (rhbz1657485)

16
jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch
View File

@ -7,7 +7,7 @@
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling 8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
Reviewed-by: erikj, goetz, dholmes Reviewed-by: erikj, goetz, dholmes
diff --git a/make/lib/SoundLibraries.gmk b/make/lib/SoundLibraries.gmk diff --git openjdk.orig/jdk/make/lib/SoundLibraries.gmk openjdk/jdk/make/lib/SoundLibraries.gmk
--- openjdk/jdk/make/lib/SoundLibraries.gmk Tue Jan 12 21:01:12 2016 +0000 --- openjdk/jdk/make/lib/SoundLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
+++ openjdk/jdk/make/lib/SoundLibraries.gmk Wed Jan 13 00:18:02 2016 +0000 +++ openjdk/jdk/make/lib/SoundLibraries.gmk Wed Jan 13 00:18:02 2016 +0000
@@ -140,6 +140,10 @@ @@ -140,6 +140,10 @@
@ -21,8 +21,8 @@ diff --git a/make/lib/SoundLibraries.gmk b/make/lib/SoundLibraries.gmk
ifeq ($(OPENJDK_TARGET_CPU), aarch64) ifeq ($(OPENJDK_TARGET_CPU), aarch64)
LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64 LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
endif endif
diff -r 1fe56343ecc8 src/share/native/com/sun/media/sound/SoundDefs.h diff -r 1fe56343ecc8 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 12 21:01:12 2016 +0000 --- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 12 21:01:12 2016 +0000
+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 13 00:18:02 2016 +0000 +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 13 00:18:02 2016 +0000
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
#define X_ARM 7 #define X_ARM 7
@ -33,7 +33,7 @@ diff -r 1fe56343ecc8 src/share/native/com/sun/media/sound/SoundDefs.h
// ********************************** // **********************************
// Make sure you set X_PLATFORM and X_ARCH defines correctly. // Make sure you set X_PLATFORM and X_ARCH defines correctly.
diff --git a/src/solaris/bin/ppc64le/jvm.cfg b/src/solaris/bin/ppc64le/jvm.cfg diff --git openjdk.orig/jdk/src/solaris/bin/ppc64le/jvm.cfg openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg +++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg
@ -72,8 +72,8 @@ new file mode 100644
+# +#
+-server KNOWN +-server KNOWN
+-client IGNORE +-client IGNORE
diff --git a/test/sun/security/pkcs11/PKCS11Test.java b/test/sun/security/pkcs11/PKCS11Test.java diff --git openjdk.orig/test/sun/security/pkcs11/PKCS11Test.java openjdk/test/sun/security/pkcs11/PKCS11Test.java
--- openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java --- openjdk.orig/jdk/test/sun/security/pkcs11/PKCS11Test.java
+++ openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java +++ openjdk/jdk/test/sun/security/pkcs11/PKCS11Test.java
@@ -505,6 +505,8 @@ @@ -505,6 +505,8 @@
osMap.put("Linux-amd64-64", new String[]{ osMap.put("Linux-amd64-64", new String[]{
@ -84,8 +84,8 @@ diff --git a/test/sun/security/pkcs11/PKCS11Test.java b/test/sun/security/pkcs11
osMap.put("Windows-x86-32", new String[]{ osMap.put("Windows-x86-32", new String[]{
PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)}); PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
osMap.put("Windows-amd64-64", new String[]{ osMap.put("Windows-amd64-64", new String[]{
diff --git a/test/tools/launcher/Settings.java b/test/tools/launcher/Settings.java diff --git openjdk.orig/jdk/test/tools/launcher/Settings.java openjdk/jdk/test/tools/launcher/Settings.java
--- openjdk/jdk/test/tools/launcher/Settings.java --- openjdk.orig/jdk/test/tools/launcher/Settings.java
+++ openjdk/jdk/test/tools/launcher/Settings.java +++ openjdk/jdk/test/tools/launcher/Settings.java
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@