Re: svn commit: r359267 - in head: . share/mk
24 mars 2020 02:24:21 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.
>
>
This is on purpose so if anyone wants to promote those from internallib to
something else, they can
They just have to remove INTERNALLIB
Best regards,
Bapt
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r359267 - in head: . share/mk
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.incTue Mar 24 01:08:06 2020(r359266)
> +++ head/ObsoleteFiles.incTue 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
> .include
> .include
> +#No need to install header for INTERNALLIB
> +.if !defined(INTERNALLIB)
> .include
> +.endif
> .endif
>
> LINKOWN?=${LIBOWN}
>
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
svn commit: r359267 - in head: . share/mk
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
+
# 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.mkTue Mar 24 01:08:06 2020(r359266)
+++ head/share/mk/bsd.lib.mkTue Mar 24 01:09:04 2020(r359267)
@@ -489,7 +489,10 @@ _libinstall:
.include
.include
.include
+#No need to install header for INTERNALLIB
+.if !defined(INTERNALLIB)
.include
+.endif
.endif
LINKOWN?= ${LIBOWN}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
