From nobody Thu Sep 14 09:20:41 2023 X-Original-To: dev-commits-src-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 4RmWyK4HyWz4t6SK; Thu, 14 Sep 2023 09:20:41 +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 4RmWyK3rX2z4bBx; Thu, 14 Sep 2023 09:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694683241; 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=7NoKuwmtEb+G+hN/VHCzqjyl2p8zHtEvP97EC03zMIk=; b=RGvt7/0M+wIyAYivZ891B5dYK1MDzX16uXPxqwofOlHd8IQzmPaOiNBgQN48LpUR6f+XpL CN6mz9z+G1BThZFVjdElTd7xAfIqKNy9b+8Pmm7jDcYU2FGRa7ki1MK24qM0tCGqp65TOZ dc+z9I7Gx6HA6KUgw/YE1147tdZefLAtaxkieVMnR3NQNrRprb9DccDCXuvBxarA0tBGAR 4Pshzi3f/VAXTbzm0XdVdQuzmrGkH88kanWCp+hMObD1YZe0dwUWZb190vFQbBWZ40gEAB OERh/PxmxrEBwOtb7JPdJmuwQhD+BoqCgvNC4TbbPEwOcILHzaYhGMbxb8pDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694683241; a=rsa-sha256; cv=none; b=P8y/Ldzem+OadnLuVefNw/LQmFFhCKmjYs25M1M2CwOfrSllCM1sIdqyxj04wp8o3RPT7m /18JFVJSABJvMS8Eoupdj+ZGm91SvZXKRrv1G8jFJL9Zs5x6wjE6dCA9X/mqPmpnJ5nUDX GeWSottytOKj9Tj5RzZdQhiYGVqP50QsmgooPnnEjIvE/svUGLEJmGdZ6J4aJkRV9FYcfU AkTz8uXHjkwdboxEVpFuqGfzEzUj/KkCCGPy/T3NH5W6R4cN6VP65JltoEycFRn+jBBAFE hrXvPu3oidApzRkQTt36bnICnzdGmWR2KOn9YnoVKIAevWGm/TIe5MVqKQU8Bg== 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=1694683241; 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=7NoKuwmtEb+G+hN/VHCzqjyl2p8zHtEvP97EC03zMIk=; b=ycSun+5/qk12aZACv7gBE/a48cCAI5ICnWUovjeXG415ou2LkLqZ5gxH/fBmqMEMqLSnHA k3nqlupSeBtU66HeLMIycmEOFtrEs2MQM4iMqG5TimiFU2XQAESFYBNerQ0DpA9U6edZIb aKs1yW5k1PIx3dVeRxBgjPXj9g7bGCmtq9/76/wYXCWCw6X2YSg3LURQmh7FHB5OWGpEbR 7QBs69iq4Mw4NhRF8pqXdlSEtJCMUXAwWCCGJcRbwnsRsD/e0lxzVpdv2KHuLzgY8kqJui 7dW7Poxl7TpwEyW6ZxxZ/LPUlJ3TmH28DzzgB5TySjkcH28g9FlVqYChRI1AFQ== 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 4RmWyK2vxqzrFn; Thu, 14 Sep 2023 09:20:41 +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 38E9Kff8021177; Thu, 14 Sep 2023 09:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9KfKW021174; Thu, 14 Sep 2023 09:20:41 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:20:41 GMT Message-Id: <202309140920.38E9KfKW021174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 4e899378bf5d - main - pkgbase: put library links and symlinks in the -dev package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4e899378bf5d89c20430d32982d2635657f34c04 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=4e899378bf5d89c20430d32982d2635657f34c04 commit 4e899378bf5d89c20430d32982d2635657f34c04 Author: Doug Rabson AuthorDate: 2023-09-13 10:18:09 +0000 Commit: Doug Rabson CommitDate: 2023-09-14 09:19:42 +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 --- 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 90d89eeebc5d..49304463d859 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -561,6 +561,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