mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
include: put includes into -dev packages
The includes build is kind of funky, as we support either copying or
symlinking files into /usr/include. For `copies`, we were supplying
the include/ ${TAG_ARGS}, which puts packages into `FreeBSD-runtime`,
without any consideration to the fact that we're installing headers.
Let's copy the approach that the `symlinks` target uses for now, and
add ",dev" to the TAG_ARGS so that headers at least end up in
FreeBSD-runtime-dev, which is more appropriate. Some of these includes
are actually technically supposed to be in *other* packages and their
INCSGROUP's PACKAGE setting is actually correct, but this is less
trivial to solve. This is a bandaid to fix the immediate problem of
some headers ending up in two different packages.
PR: 267526
Reviewed by: dfr, manu
Differential Revision: https://reviews.freebsd.org/D37256
(cherry picked from commit 8b8babf044
)
This commit is contained in:
parent
fa4ac142ef
commit
2b20cade1e
|
@ -350,29 +350,29 @@ copies: .PHONY .META
|
|||
-name "*.h" -print -delete || true
|
||||
.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec} ${LSUBSUBDIRS}
|
||||
cd ${SRCTOP}/sys; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||
${SDESTDIR}${INCLUDEDIR}/$i
|
||||
.endfor
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${SDESTDIR}${INCLUDEDIR}/machine
|
||||
.if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${SDESTDIR}${INCLUDEDIR}/machine/pc
|
||||
.endif
|
||||
.for _MARCH in ${_MARCHS}
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${INSTALL} -d ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${SDESTDIR}${INCLUDEDIR}/${_MARCH}; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${SDESTDIR}${INCLUDEDIR}/${_MARCH}
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${INSTALL} -d ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc
|
||||
.endif
|
||||
.endif
|
||||
|
|
Loading…
Reference in a new issue