Date: Fri, 20 Oct 2023 14:14:13 GMT From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8015c5477bd9 - stable/14 - pkgbase: put library links and symlinks in the -dev package Message-ID: <202310201414.39KEEDFZ055054@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=8015c5477bd9a110f12c77ab9d2bd98a15258ec2 commit 8015c5477bd9a110f12c77ab9d2bd98a15258ec2 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2023-09-13 10:18:09 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> 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 <bsd.links.mk> .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310201414.39KEEDFZ055054>