mirror of
https://git.freebsd.org/ports.git
synced 2025-05-16 09:11:50 -04:00
c1b344b011
* Backport the fix from jdk17u so that --with-harfbuzz=system adds -lharfbuzz when linking libfontmanager.so Reported by: barulheira@gmail.com
20 lines
930 B
Text
20 lines
930 B
Text
--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700
|
|
+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700
|
|
@@ -435,7 +435,7 @@
|
|
|
|
ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
|
|
LIBFONTMANAGER_EXTRA_SRC =
|
|
- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
|
|
+ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS)
|
|
else
|
|
LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
|
|
|
|
@@ -530,7 +530,7 @@
|
|
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
|
|
LDFLAGS_aix := -Wl$(COMMA)-berok, \
|
|
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
|
|
- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
|
|
+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
|
|
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
|
|
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
|
|
$(WIN_AWT_LIB), \
|