Module Name: src
Committed By: riastradh
Date: Wed Nov 13 03:38:51 UTC 2024
Modified Files:
src/tests/lib/libarchive: Makefile
src/usr.sbin/makemandb: Makefile
Log Message:
makemandb(8): Fix static build with PROGDPLIBS.
XXX This shouldn't have to mention transitive dependencies -- we
should have a mechanism for upstream build goo for libarchive to
transmit the information automatically to downstream build goo for
makemandb.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libarchive/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makemandb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libarchive/Makefile
diff -u src/tests/lib/libarchive/Makefile:1.14 src/tests/lib/libarchive/Makefile:1.15
--- src/tests/lib/libarchive/Makefile:1.14 Wed Oct 30 18:09:19 2024
+++ src/tests/lib/libarchive/Makefile Wed Nov 13 03:38:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/10/30 18:09:19 christos Exp $
+# $NetBSD: Makefile,v 1.15 2024/11/13 03:38:51 riastradh Exp $
NOMAN=
@@ -20,6 +20,9 @@ DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBB
${LIBCRYPTO} ${LIBPTHREAD}
LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+PROGDPLIBS+= ${ZSTDDPLIBS} # needed by libarchive
+
SRCS.h_libarchive= \
read_open_memory.c \
test_acl_nfs4.c \
Index: src/usr.sbin/makemandb/Makefile
diff -u src/usr.sbin/makemandb/Makefile:1.12 src/usr.sbin/makemandb/Makefile:1.13
--- src/usr.sbin/makemandb/Makefile:1.12 Thu Nov 12 17:53:43 2020
+++ src/usr.sbin/makemandb/Makefile Wed Nov 13 03:38:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/11/12 17:53:43 nia Exp $
+# $NetBSD: Makefile,v 1.13 2024/11/13 03:38:51 riastradh Exp $
.include <bsd.own.mk>
@@ -32,6 +32,14 @@ DPADD.makemandb+= ${LIBCRYPTO}
DPADD+= ${LIBSQLITE3} ${LIBM} ${LIBZ} ${LIBTERMLIB} ${LIBUTIL}
LDADD+= -lsqlite3 -lm -lz -ltermlib -lutil
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+# XXX No PROGDPLIBS.${P} in <bsd.prog.mk>.
+#PROGDPLIBS.makemandb+= ${ZSTDDPLIBS} # needed by libarchive
+ZSTD_OBJDIR!= cd ${ZSTD:Q}/lib && ${PRINTOBJDIR}
+LDADD.makemandb+= -L${ZSTD_OBJDIR} -lzstd
+DPADD.makemandb+= ${ZSTD_OBJDIR}/libzstd.a # XXX or libzstd_pic.a
+
+
stopwords.c: stopwords.txt
( set -e; ${TOOL_NBPERF} -n stopwords_hash -s -p ${.ALLSRC}; \
echo 'static const char *stopwords[] = {'; \
