diff options
| author | Pierre Pronchery <khorben@FreeBSD.org> | 2026-04-08 16:52:29 +0000 |
|---|---|---|
| committer | Pierre Pronchery <khorben@FreeBSD.org> | 2026-04-22 13:42:56 +0000 |
| commit | b8352da33f3434f0ba6093df361261d1b1f973a1 (patch) | |
| tree | 0f0a0a82e1e5654533422af8d0f92d50205a36b6 /usr.bin | |
| parent | a3cefe7f2b4df0f70ff92d4570ce18e517af43ec (diff) | |
pkgconf: import into the base system
This introduces the following option:
* MK_PKGCONF: determines if pkgconf and bomtool should be built
The objective is to allow the creation of SBOM information while
building FreeBSD's src tree. The build system cannot rely on the
presence of bomtool (and eventually also spdxtool) in the build
environment, except for having it as part of the src tree directly.
The framework implementing the generation of SBOM files is under review
in D56474.
This will also help simplifying the build, with the introduction of
another framework relying on the availability of pkgconf.
Sponsored by: Alpha-Omega, The FreeBSD Foundation
Reviewed by: bapt, philip
Approved by: philip (mentor)
Differential Revision: https://reviews.freebsd.org/D56404
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/bomtool/Makefile | 20 | ||||
| -rw-r--r-- | usr.bin/pkgconf/Makefile | 23 |
3 files changed, 45 insertions, 0 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 6ca784ef6cb6..6718286e7ddb 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -234,6 +234,8 @@ SUBDIR.${MK_NIS}+= ypcat SUBDIR.${MK_NIS}+= ypmatch SUBDIR.${MK_NIS}+= ypwhich SUBDIR.${MK_OPENSSH}+= ssh-copy-id +SUBDIR.${MK_PKGCONF}+= bomtool +SUBDIR.${MK_PKGCONF}+= pkgconf SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_SOUND}+= beep diff --git a/usr.bin/bomtool/Makefile b/usr.bin/bomtool/Makefile new file mode 100644 index 000000000000..f9471f35801b --- /dev/null +++ b/usr.bin/bomtool/Makefile @@ -0,0 +1,20 @@ +PACKAGE= pkgconf + +PROG= bomtool +SRCS= main.c +SRCS+= getopt_long.c + +LIBADD= pkgconf + +PKGCONFDIR= ${SRCTOP}/contrib/pkgconf + +CFLAGS+= -Wno-error=missing-variable-declarations +CFLAGS+= -Wno-error=incompatible-pointer-types-discards-qualifiers +CFLAGS+= -Wno-error=cast-qual +CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} -I${PKGCONFDIR}/cli + +.PATH: ${PKGCONFDIR}/cli/bomtool +.PATH: ${PKGCONFDIR}/cli +.PATH: ${PKGCONFDIR}/man + +.include <bsd.prog.mk> diff --git a/usr.bin/pkgconf/Makefile b/usr.bin/pkgconf/Makefile new file mode 100644 index 000000000000..2155201ac883 --- /dev/null +++ b/usr.bin/pkgconf/Makefile @@ -0,0 +1,23 @@ +PACKAGE= pkgconf + +PROG= pkgconf +SRCS= main.c +SRCS+= getopt_long.c +SRCS+= renderer-msvc.c + +LIBADD= pkgconf + +SYMLINKS= pkgconf ${BINDIR}/pkg-config + +PKGCONFDIR= ${SRCTOP}/contrib/pkgconf + +CFLAGS+= -Wno-error=missing-variable-declarations +CFLAGS+= -Wno-error=incompatible-pointer-types-discards-qualifiers +CFLAGS+= -Wno-error=cast-qual +CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" -DSYSTEM_LIBDIR=\"/usr/lib\" +CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} + +.PATH: ${PKGCONFDIR}/cli +.PATH: ${PKGCONFDIR}/man + +.include <bsd.prog.mk> |