aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2023-09-13 10:18:09 +0000
committerDoug Rabson <dfr@FreeBSD.org>2023-10-20 12:16:47 +0000
commit8015c5477bd9a110f12c77ab9d2bd98a15258ec2 (patch)
treeb53232a68e31cb66837f59182a447f8a7ebcde40
parentc81166b018acfbe521f52415ff37b8c2696d77c6 (diff)
downloadsrc-8015c5477bd9a110f12c77ab9d2bd98a15258ec2.tar.gz
src-8015c5477bd9a110f12c77ab9d2bd98a15258ec2.zip
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)
-rw-r--r--share/mk/bsd.lib.mk1
-rw-r--r--share/mk/bsd.links.mk8
2 files changed, 9 insertions, 0 deletions
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