From bceb750dafd5bd3eeb57ee210887e4bcdc6edcd8 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Thu, 25 Jan 2018 20:29:07 +0100
Subject: [PATCH] Fix FTBFS due to link failure of libfontmanager.so

A recent change in redhat-rpm-config makes the
hardened builds link with -Wl,-z,defs.

See RHBZ#1535422 for the bug which introduced this
change in redhat-rpm-config.

That change, in turn, provokes a build failure due
to a missing lib not being listed when linking
libfontmanager.so.

Resolves RHBZ#1538767
---
 java-1.8.0-openjdk.spec        | 11 ++++++++++-
 rhbz_1538767_fix_linking.patch | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 rhbz_1538767_fix_linking.patch

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 99981a7..1613d26 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: 0.%{buildver}%{?dist}
+Release: 1.%{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
@@ -1042,6 +1042,8 @@ Patch205: dont-add-unnecessary-debug-links.patch
 Patch206: hotspot-assembler-debuginfo.patch
 # 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
 Patch560: 8188030-pr3459-rh1484079.patch
+# 8196218, RH1538767: libfontmanager.so needs to link against headless awt library
+Patch561: rhbz_1538767_fix_linking.patch
 
 # Arch-specific upstreamable patches
 # PR2415: JVM -Xmx requirement is too high on s390
@@ -1491,6 +1493,9 @@ sh %{SOURCE12}
 %patch551
 %patch553
 %patch560
+pushd openjdk/jdk
+%patch561 -p1
+popd
 
 # PPC64 updates
 %patch556
@@ -2124,6 +2129,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Jan 24 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.161-1.b14
+- Fix FTBFS due to link failure in libfontmanager.so
+- See RHBZ#1538767
+
 * Wed Jan 24 2018 jvanek <jvanek@redhat.com> - 1:1.8.0.161-0.b14
 - updated to u161, rmeoved upstreamed patches
 - removed patch555 8164293-pr3412-rh1459641.patch
diff --git a/rhbz_1538767_fix_linking.patch b/rhbz_1538767_fix_linking.patch
new file mode 100644
index 0000000..10c2cc2
--- /dev/null
+++ b/rhbz_1538767_fix_linking.patch
@@ -0,0 +1,21 @@
+diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
+--- a/make/lib/Awt2dLibraries.gmk
++++ b/make/lib/Awt2dLibraries.gmk
+@@ -921,7 +921,7 @@
+     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+         $(call SET_SHARED_LIBRARY_ORIGIN), \
+     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
+-    LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
++    LDFLAGS_SUFFIX_linux := -lawt_headless -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
+     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
+@@ -938,7 +938,7 @@
+ 
+ $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
+ 
+-ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
++ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix linux))
+   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
+ endif
+