git: 4e899378bf5d - main - pkgbase: put library links and symlinks in the -dev package
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Sep 2023 09:20:41 UTC
The branch main has been updated by dfr:
URL: https://cgit.FreeBSD.org/src/commit/?id=4e899378bf5d89c20430d32982d2635657f34c04
commit 4e899378bf5d89c20430d32982d2635657f34c04
Author: Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-09-13 10:18:09 +0000
Commit: Doug Rabson <dfr@FreeBSD.org>
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 <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