From nobody Fri Oct 20 14:14:13 2023 X-Original-To: dev-commits-src-all@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 4SBmmP5rtBz4xqHX; Fri, 20 Oct 2023 14:14:13 +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 4SBmmP5Ks1z4mMP; Fri, 20 Oct 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6QS9VnA1lCWOBcC468GXTQiEYH14OgHiDyAKr/L6iI=; b=ArqoaXuuA7aFCsMbAtxlTEqvoEJSK2gzfMCdTukhohMmeBIIMhpXNKzU4e/eToOHv7Wx0t UvvRbLjKDO8hLIMt72meI8V7MZFdAcvCldOi2u7cKYEPRZdQEnhExLCjBu7HeRN+VTM/ZF nORc225qMtFnuobYHc/PWv7CGCPyv3avLgCPqXUKsCbmOZozkOBQIgAYAFFewXdHEKYx6e PyNJKRoqCnjq8qjYCHCqnvE1M5oe+/VHZFUrjAeLaQ2xNv9dNttuy8ozIH+n+sLPTgfGTc jSnenef1EQtvKGvcFyxyxgSoOdd2rd57ZmAVoddtFgij9fWyHGetUlZNZgdtyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697811253; a=rsa-sha256; cv=none; b=kCPLs5rBqGpfffyPXVl7K0r04F9NpW7xK9BGiUs+BVEaAgpolIR/PFq06tRA7umTRt+QvJ j9yqyz2hpvLjAb61ewjFyGnCi+KsKajCD60vDASdN/IQfWi3Jh975yHeLIfU9VAy+j0UMo UNaaNY5FQ2WarzCRr1Lgqf09zQHPPZoM+xUBAE9nnKJy2Mjl6atIoSDNFLLBsciFjlvi6s AjlXGvTAlXQ5buuBi4q2kH1KHFYT78h1O1/GsDsSLl6DqAAwfaUpZ6mCZEsnuTPk+RlWRE CIddVfr7ier675d430C3WzA91zNaV/K3TvkbORYz/HNOvF3k7CPBeHGDc69Ubg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6QS9VnA1lCWOBcC468GXTQiEYH14OgHiDyAKr/L6iI=; b=bzHOfWQBQzdhJ+k56fERbI5HIRf5NFbUC4eQCvwJZfEnAgr1mh3rpy7iq15dpigf7aj0ya fRGX2lsu1+ESzEWcUaWFGNBPQ3LjKLu1Dhp6UbwvXDuneB9Oqygm27PXfH5EcNnAHeIU7K 5GpUPH6/8dvhNPN6exY5DW7uKkhz9WoHMkb9NG+oEg9OXWvKLJfx/9qiUHzhu6UJbgWyPZ 5Dp6iVYCm6ue+PjB/BcRPV1vEUMi76dAtEBBL6ypnBvx1OwTyIhHz8msVVvUKGP/xPjo1w gb5tckqzt0aIbDSJvHDmM5EmHn2+6Q016/mqcKaBF7zEtPzvUtf9XsohEkALhg== 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 4SBmmP4PK4zbMk; Fri, 20 Oct 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KEEDau055057; Fri, 20 Oct 2023 14:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KEEDFZ055054; Fri, 20 Oct 2023 14:14:13 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:14:13 GMT Message-Id: <202310201414.39KEEDFZ055054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 8015c5477bd9 - stable/14 - pkgbase: put library links and symlinks in the -dev package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8015c5477bd9a110f12c77ab9d2bd98a15258ec2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=8015c5477bd9a110f12c77ab9d2bd98a15258ec2 commit 8015c5477bd9a110f12c77ab9d2bd98a15258ec2 Author: Doug Rabson AuthorDate: 2023-09-13 10:18:09 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 12:16:47 +0000 pkgbase: put library links and symlinks in the -dev package Some libraries (e.g. ncurses) install links to the main library for backwards compatibilty. This change ensures that those links are in the dev package since the files being linked to are in that package. PR: 249143 MFC after: 1 week Reviewed by: emaste, manu Differential Revision: https://reviews.freebsd.org/D41841 (cherry picked from commit 4e899378bf5d89c20430d32982d2635657f34c04) --- share/mk/bsd.lib.mk | 1 + share/mk/bsd.links.mk | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3099c8e205b1..5f328d5378ca 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -568,6 +568,7 @@ LINKGRP?= ${LIBGRP} LINKMODE?= ${LIBMODE} SYMLINKOWN?= ${LIBOWN} SYMLINKGRP?= ${LIBGRP} +LINKTAGS= dev .include .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 990c4cb65a29..6070979612bf 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -14,8 +14,16 @@ afterinstall: _installlinks .ORDER: realinstall _installlinks _installlinks: .for s t in ${LINKS} +.if defined(LINKTAGS) + ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${DESTDIR}${s} ${DESTDIR}${t} +.else ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} +.endif .endfor .for s t in ${SYMLINKS} +.if defined(LINKTAGS) + ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${s} ${DESTDIR}${t} +.else ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}${t} +.endif .endfor