make/lib/Awt2dLibraries.gmk

@  rev 49621 : 8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
|  Summary: Fixes build failures on some sustems with custom LDFLAGS settings.
~

*** 617,626 ****
--- 617,630 ----
    BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
    # Turn off aliasing with GCC for ExtensionSubtables.cpp
    BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
  endif
  
+ # LDFLAGS clarification:
+ #   Filter relevant linker flags disallowing unresolved symbols as we cannot
+ #   build-time decide to which library to link against (libawt_headless or
+ #   libawt_xawt). See JDK-8196516 for details.
  $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
      NAME := fontmanager, \
      SRC := $(LIBFONTMANAGER_SRC), \
      EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
          AccelGlyphCache.c, \
*** 642,652 ****
          E_ENUM_VAL_OVERFLOWS_INT_MAX, \
      DISABLED_WARNINGS_CXX_solstudio := \
          truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
          hidevf w_novirtualdescr arrowrtn2, \
      DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
!     LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
      LDFLAGS_macosx := -undefined dynamic_lookup, \
      LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
      LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
--- 646,657 ----
          E_ENUM_VAL_OVERFLOWS_INT_MAX, \
      DISABLED_WARNINGS_CXX_solstudio := \
          truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
          hidevf w_novirtualdescr arrowrtn2, \
      DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
!     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
!                     $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
      LDFLAGS_macosx := -undefined dynamic_lookup, \
      LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
      LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \