summarylogtreecommitdiffstats
path: root/004_add-fontconfig.patch
diff options
context:
space:
mode:
Diffstat (limited to '004_add-fontconfig.patch')
-rw-r--r--004_add-fontconfig.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/004_add-fontconfig.patch b/004_add-fontconfig.patch
index da25036b9a2..9fc8a005fb7 100644
--- a/004_add-fontconfig.patch
+++ b/004_add-fontconfig.patch
@@ -1,12 +1,12 @@
diff -rupN a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
---- a/make/lib/Awt2dLibraries.gmk 2014-09-14 18:57:10.466023148 +0200
-+++ b/make/lib/Awt2dLibraries.gmk 2014-09-14 18:58:11.888148006 +0200
-@@ -827,7 +827,7 @@ $(eval $(call SetupNativeCompilation,BUI
+--- a/make/lib/Awt2dLibraries.gmk 2015-07-13 20:50:59.000000000 +0300
++++ b/make/lib/Awt2dLibraries.gmk 2015-08-24 12:12:22.930330643 +0300
+@@ -824,7 +824,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 := -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
- LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
+ 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 \