components/runtime/openjdk-8/patches/0045-patch-jdk_make_lib_Awt2dLibraries.gmk.patch

   1 $NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.5 2018/12/12 14:22:11 ryoon Exp $
   2
   3 GCC support.
   4
   5 --- jdk/make/lib/Awt2dLibraries.gmk.orig        2018-12-09 09:51:37.000000000 +0000
   6 +++ jdk/make/lib/Awt2dLibraries.gmk
   7 @@ -684,7 +686,6 @@ $(eval $(call SetupNativeCompilation,BUI
   8          $(SHARED_LIBRARY_FLAGS) \
   9          -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
  10          -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
  11 -    CFLAGS_solaris := -xc99=no_lib, \
  12      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
  13      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
  14      LDFLAGS := $(LDFLAGS_JDKLIB) \
  15 @@ -1062,7 +1063,7 @@ else # OPENJDK_TARGET_OS not windows
  16        JAWT_LIBS += -lawt
  17      endif
  18      ifndef BUILD_HEADLESS_ONLY
  19 -      JAWT_LIBS += -lawt_xawt
  20 +      JAWT_LIBS += $(X_LIBS) -lawt_xawt
  21      else
  22        JAWT_LIBS += -lawt_headless
  23        HEADLESS_CFLAG += -DHEADLESS