svn commit: r359267 - in head: . share/mk

[Bryan Drewery]

On 3/23/2020 6:09 PM, Emmanuel Vadot wrote:
> Author: manu
> Date: Tue Mar 24 01:09:04 2020
> New Revision: 359267
> URL: https://svnweb.freebsd.org/changeset/base/359267
> 
> Log:
>   bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
>   
>   If 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.
>   
>   Reported by:	pizzamig
>   Reviewed by:	pizzamig bapt emaste
>   Differential Revision:	https://reviews.freebsd.org/D24166
> 
> Modified:
>   head/ObsoleteFiles.inc
>   head/share/mk/bsd.lib.mk
> 
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc	Tue Mar 24 01:08:06 2020	(r359266)
> +++ head/ObsoleteFiles.inc	Tue Mar 24 01:09:04 2020	(r359267)
> @@ -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
> +

lib/libelftc/Makefile:INCS=     libelftc.h
lib/libifconfig/Makefile:INCSDIR=       ${INCLUDEDIR}
lib/libifconfig/Makefile:INCS=          libifconfig.h
lib/libpmcstat/Makefile:INCS=   libpmcstat.h

This commit seems incomplete or wrong due to the leftover logic.


>  # 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	Tue Mar 24 01:08:06 2020	(r359266)
> +++ head/share/mk/bsd.lib.mk	Tue Mar 24 01:09:04 2020	(r359267)
> @@ -489,7 +489,10 @@ _libinstall:
>  .include <bsd.nls.mk>
>  .include <bsd.confs.mk>
>  .include <bsd.files.mk>
> +#No need to install header for INTERNALLIB
> +.if !defined(INTERNALLIB)
>  .include <bsd.incs.mk>
> +.endif
>  .endif
>  
>  LINKOWN?=	${LIBOWN}
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20200323/aed1df34/attachment.sig>