From owner-svn-src-all@freebsd.org Wed Mar 25 01:35:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0BB75271463; Wed, 25 Mar 2020 01:35:21 +0000 (UTC) (envelope-from manu@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48n9fb29Srz45mB; Wed, 25 Mar 2020 01:35:19 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADCBEA331; Wed, 25 Mar 2020 01:35:14 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02P1ZE5l068923; Wed, 25 Mar 2020 01:35:14 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02P1ZEsj068921; Wed, 25 Mar 2020 01:35:14 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202003250135.02P1ZEsj068921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 25 Mar 2020 01:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359293 - in head: . share/mk X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head: . share/mk X-SVN-Commit-Revision: 359293 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 01:35:21 -0000 Author: manu Date: Wed Mar 25 01:35:13 2020 New Revision: 359293 URL: https://svnweb.freebsd.org/changeset/base/359293 Log: 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. Modified: head/ObsoleteFiles.inc head/share/mk/bsd.lib.mk Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Mar 25 01:32:16 2020 (r359292) +++ head/ObsoleteFiles.inc Wed Mar 25 01:35:13 2020 (r359293) @@ -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 Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Wed Mar 25 01:32:16 2020 (r359292) +++ head/share/mk/bsd.lib.mk Wed Mar 25 01:35:13 2020 (r359293) @@ -489,7 +489,10 @@ _libinstall: .include .include .include +#No need to install header for INTERNALLIB +.if !defined(INTERNALLIB) .include +.endif .endif LINKOWN?= ${LIBOWN}