From 812ccd54f917854bbe2400680e7a47123e95020c Mon Sep 17 00:00:00 2001 From: Jiri Date: Mar 27 2018 15:52:31 +0000 Subject: Added patch 540 rhbz1548475-LDFLAGSusage.patch to honor build flags fully --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 6a20565..34d6475 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -937,7 +937,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1} Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 1.%{buildver}%{?dist} +Release: 2.%{buildver}%{?dist} # 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 # also included the epoch in their virtual provides. This created a @@ -1076,6 +1076,7 @@ Patch400: 8154313.patch Patch526: 6260348-pr3066.patch # 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property" Patch538: 8061305-pr3335-rh1423421.patch +Patch540: rhbz1548475-LDFLAGSusage.patch # Patches ineligible for 8u # 8043805: Allow using a system-installed libjpeg @@ -1476,6 +1477,7 @@ sh %{SOURCE12} %patch526 %patch528 %patch538 +%patch540 %patch560 pushd openjdk/jdk %patch561 -p1 @@ -2113,6 +2115,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Mar 26 2018 Jiri Vanek - 1:1.8.0.162-1.b12 +- Added patch 540 rhbz1548475-LDFLAGSusage.patch to honor build flags fully + * Wed Mar 21 2018 Andrew Hughes - 1:1.8.0.162-1.b12 - Update to aarch64-jdk8u162-b12 and aarch64-shenandoah-jdk8u162-b12. - Remove upstreamed patches for 8181055/PR3394/RH1448880, diff --git a/rhbz1548475-LDFLAGSusage.patch b/rhbz1548475-LDFLAGSusage.patch new file mode 100644 index 0000000..bde08b4 --- /dev/null +++ b/rhbz1548475-LDFLAGSusage.patch @@ -0,0 +1,37 @@ +# User jvanek +# https://bugzilla.redhat.com/show_bug.cgi?id=1548475 +# java-1.8.0-openjdk: Partial build flags injection +# LFLAGS += $(EXTRA_CFLAGS) corrected to LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) +--- openjdk/hotspot/make/aix/makefiles/vm.make ++++ openjdk/hotspot/make/aix/makefiles/vm.make +@@ -117,7 +117,7 @@ + + # Extra flags from gnumake's invocation or environment + CFLAGS += $(EXTRA_CFLAGS) +-LFLAGS += $(EXTRA_CFLAGS) ++LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) + + # Don't set excutable bit on stack segment + # the same could be done by separate execstack command +--- openjdk/hotspot/make/bsd/makefiles/vm.make ++++ openjdk/hotspot/make/bsd/makefiles/vm.make +@@ -119,7 +119,7 @@ + + # Extra flags from gnumake's invocation or environment + CFLAGS += $(EXTRA_CFLAGS) +-LFLAGS += $(EXTRA_CFLAGS) ++LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) + + # Don't set excutable bit on stack segment + # the same could be done by separate execstack command +--- openjdk/hotspot/make/linux/makefiles/vm.make ++++ openjdk/hotspot/make/linux/makefiles/vm.make +@@ -122,7 +122,7 @@ + + # Extra flags from gnumake's invocation or environment + CFLAGS += $(EXTRA_CFLAGS) +-LFLAGS += $(EXTRA_CFLAGS) ++LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) + + # Don't set excutable bit on stack segment + # the same could be done by separate execstack command