Date: Sun, 10 Oct 2021 00:30:35 GMT From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c1b344b01132 - main - java/openjdk17: Fix libfontmanager linkage Message-ID: <202110100030.19A0UZ3o093306@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1b344b0113225b3e2cba70ffc9f571f14c734f1 commit c1b344b0113225b3e2cba70ffc9f571f14c734f1 Author: Greg Lewis <glewis@FreeBSD.org> AuthorDate: 2021-10-10 00:28:41 +0000 Commit: Greg Lewis <glewis@FreeBSD.org> CommitDate: 2021-10-10 00:28:41 +0000 java/openjdk17: Fix libfontmanager linkage * Backport the fix from jdk17u so that --with-harfbuzz=system adds -lharfbuzz when linking libfontmanager.so Reported by: barulheira@gmail.com --- java/openjdk17/Makefile | 1 + .../files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index b048691e65a1..50d43bd35a2f 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -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 diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 65f66318255d..11eaa6868f3e 100644 --- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -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, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110100030.19A0UZ3o093306>