From nobody Sun Oct 10 00:30:35 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E584D17E074F; Sun, 10 Oct 2021 00:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HRjWb67Gmz3h27; Sun, 10 Oct 2021 00:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B23F723AFF; Sun, 10 Oct 2021 00:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19A0UZZp093307; Sun, 10 Oct 2021 00:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19A0UZ3o093306; Sun, 10 Oct 2021 00:30:35 GMT (envelope-from git) Date: Sun, 10 Oct 2021 00:30:35 GMT Message-Id: <202110100030.19A0UZ3o093306@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: c1b344b01132 - main - java/openjdk17: Fix libfontmanager linkage List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b344b0113225b3e2cba70ffc9f571f14c734f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1b344b0113225b3e2cba70ffc9f571f14c734f1 commit c1b344b0113225b3e2cba70ffc9f571f14c734f1 Author: Greg Lewis AuthorDate: 2021-10-10 00:28:41 +0000 Commit: Greg Lewis 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, \