packages: Move ctf-tools to ctf

Remove the ctf-tools package.  Add a new package which contains the
previous contents of ctf-tools along with libctf.  This removes
CDDL-licensed code from the utilities package.

Set LIB_PACKAGE for libctf so that DTrace runtime doesn't need to
install the tools.

MFC after:	1 day
Reviewed by:	bapt
Sponsored by:	https://www.patreon.com/bsdivy
Differential Revision:	https://reviews.freebsd.org/D52776
This commit is contained in:
Lexi Winter
2025-09-30 09:29:37 +01:00
parent 25d551b5fb
commit 24e4dcf4ba
5 changed files with 8 additions and 5 deletions
+2
View File
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
PACKAGE= ctf
LIB_PACKAGE=
LIB= ctf
SRCS= ctf_create.c \
ctf_decl.c \
+1 -1
View File
@@ -3,7 +3,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
PACKAGE= ctf-tools
PACKAGE= ctf
PROG= ctfconvert
SRCS= alist.c \
ctf.c \
+1 -1
View File
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
PACKAGE= ctf-tools
PACKAGE= ctf
PROG= ctfdump
SRCS= dump.c \
symbol.c \
+1 -1
View File
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
PACKAGE= ctf-tools
PACKAGE= ctf
PROG= ctfmerge
SRCS= alist.c \
barrier.c \
@@ -21,7 +21,7 @@
* text is licensed under the CDDL.
*/
comment = "Compact C Type Format (CTF) utilities"
comment = "Compact C Type Format (CTF)"
desc = <<EOD
The Compact C Type Format (CTF) is a method of encoding type information for C
@@ -29,7 +29,8 @@ programs inside ELF objects. Compared to the common DWARF debug symbol format,
CTF is intended specifically for runtime program analyzers such as DTrace.
This package provides the ctfconvert(1), ctfdump(1) and ctfmerge(1) utilities
which are used to work with CTF data.
which are used to work with CTF data, and the libctf library which allows
application to access CTF debugging information programatically.
EOD
licenses = [ "CDDL-1.0" ]