PR#17: Adjust system NSS patch for -Wl,--as-needed. - rpms/java-openjdk

rpms / java-openjdk

#17 Adjust system NSS patch for -Wl,--as-needed.

Merged 4 years ago by jerboaa. Opened 4 years ago by jerboaa.

rpms/ jerboaa/java-openjdk master into master

Adjust system NSS patch for -Wl,--as-needed.

Severin Gehwolf • 4 years ago

1828873

file modified

+7 -2

		`@@ -99,8 +99,13 @@`
		`#`
		`# On sol-sparc...all libraries are compiled with -xregs=no%appl`
		`# (set in CFLAGS_REQUIRED_sparc)`
		`- @@ -60,7 +66,7 @@`
		`- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \`
		`+ @@ -57,10 +63,11 @@`
		`+ DISABLED_WARNINGS_gcc := sign-compare, \`
		`+ DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \`
		`+ MAPFILE := $(TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \`
		`+ - LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \`
		`+ + LDFLAGS := $(subst -Xlinker --as-needed,, \`
		`+ + $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \`
		`LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \`
		`LIBS := $(LIBCXX), \`
		`- LIBS_linux := -lc, \`

java-openjdk.spec

file modified

+6 -1

		`@@ -861,7 +861,7 @@`

		`Name: java-%{origin}`
		`Version: %{newjavaver}.%{buildver}`
		`- Release: 7%{?dist}`
		`+ Release: 8%{?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`
		`@@ -1763,6 +1763,11 @@`


		`%changelog`
		`+ * Wed Aug 29 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:10.0.3.13-8`
		`+ - Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so`
		`+ as to account for -Wl,--as-needed default linker flag by filtering`
		`+ it. Resolves RHBZ#1623399.`
		`+`
		`* Thu Aug 23 2018 Jiri Vanek <jvanek@redhat.com> - 1:10.0.3.13-6`
		`- dissabled accessibility, fixed provides for main package's debug variant`
		`- now buildrequires javapackages-filesystem as the issue with macros should be fixed`

jerboaa commented 4 years ago

redhat-rpm-config package turned on -Wl,--as-needed linker
flag by default, breaking the SunEC via system NSS provider
build. This fixes it by filtering -Wl,--as-needed from
linker flags when SunEC provider is being built.

Resolves: RHBZ#1623399