From 3196f30ea6c7997d625340186b613bb35b921ebc Mon Sep 17 00:00:00 2001 From: manu Date: Wed, 25 Mar 2020 01:35:13 +0000 Subject: [PATCH] Re-apply r359267 now that tools are using the proper include path Original commit message: bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB f we're building an internal lib do not bother including bsd.incs.mk so we will not install the headers. This also "solves" a problem with pkgbase where a libXXX-development package is created and due to how packages are created we add a dependency to a libXXX package that doesn't exists. --- ObsoleteFiles.inc | 5 +++++ share/mk/bsd.lib.mk | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 94e4202bd640..63df5f958266 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20200323: INTERNALLIB don't install headers anymore +OLD_FILES+=usr/include/libelftc.h +OLD_FILES+=usr/include/libifconfig.h +OLD_FILES+=usr/include/libpmcstat.h + # 20200320: cx and ctau drivers retired OLD_FILES+=usr/share/man/man4/ctau.4.gz OLD_FILES+=usr/share/man/man4/cx.4.gz diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index ee870b84fd96..85fbb0dac84e 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -489,8 +489,11 @@ _libinstall: .include .include .include +#No need to install header for INTERNALLIB +.if !defined(INTERNALLIB) .include .endif +.endif LINKOWN?= ${LIBOWN} LINKGRP?= ${LIBGRP}