mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-28 10:08:24 +00:00
Code Issues Releases Activity

java/openjdk17: Fix libfontmanager linkage

Browse Source 
* Backport the fix from jdk17u so that --with-harfbuzz=system adds
  -lharfbuzz when linking libfontmanager.so

Reported by:	barulheira@gmail.com
This commit is contained in:
Greg Lewis 2021-10-09 17:28:41 -07:00
parent 213bb7ddde
commit c1b344b011
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/openjdk17/Makefile
View File

@ -2,6 +2,7 @@ PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
CATEGORIES= java devel
PORTREVISION= 1
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
MAINTAINER= java@FreeBSD.org

9
java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
View File

@ -1,5 +1,14 @@
--- 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, \