git: c876932bbafd - stable/14 - lib: hook libder up to the build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Jan 2025 02:48:36 UTC
The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c876932bbafdd20c6d5a1f733c45fc7bc0d67e0c commit c876932bbafdd20c6d5a1f733c45fc7bc0d67e0c Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2025-01-11 02:48:22 +0000 lib: hook libder up to the build libder will be used in upcoming ECC support in the pkg(7) bootstrap to read DER-encoded keys and signatures. (cherry picked from commit f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2) --- lib/Makefile | 1 + lib/libder/Makefile | 13 +++++++++++++ share/mk/src.libnames.mk | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index 294e2b695bdc..6c5edfdc8f76 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -17,6 +17,7 @@ SUBDIR_BOOTSTRAP= \ libc++ \ libc++experimental \ libcxxrt \ + libder \ libelf \ libssp \ libssp_nonshared \ diff --git a/lib/libder/Makefile b/lib/libder/Makefile new file mode 100644 index 000000000000..bdd2225f0ff3 --- /dev/null +++ b/lib/libder/Makefile @@ -0,0 +1,13 @@ + +LIB= der +INTERNALLIB= + +.PATH: ${SRCTOP}/contrib/libder/libder +SRCS+= libder.c \ + libder_error.c \ + libder_obj.c \ + libder_read.c \ + libder_type.c \ + libder_write.c + +.include <bsd.lib.mk> diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d7350ce5c049..9cba6c8cc7c3 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -43,6 +43,7 @@ _INTERNALLIBS= \ bsnmptools \ c_nossp_pic \ cron \ + der \ elftc \ fdt \ fifolog \ @@ -586,6 +587,9 @@ LIBTELNET?= ${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a LIBCRONDIR= ${_LIB_OBJTOP}/usr.sbin/cron/lib LIBCRON?= ${LIBCRONDIR}/libcron${PIE_SUFFIX}.a +LIBDERDIR= ${_LIB_OBJTOP}/lib/libder +LIBDER?= ${LIBDERDIR}/libder${PIE_SUFFIX}.a + LIBNTPDIR= ${_LIB_OBJTOP}/usr.sbin/ntp/libntp LIBNTP?= ${LIBNTPDIR}/libntp${PIE_SUFFIX}.a