Module Name: src
Committed By: martin
Date: Mon Nov 11 11:44:51 UTC 2024
Modified Files:
src/usr.bin/mail: Makefile
src/usr.bin/unzip: Makefile
Log Message:
Add support for static linking of libzstd
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/mail/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/unzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/Makefile
diff -u src/usr.bin/mail/Makefile:1.44 src/usr.bin/mail/Makefile:1.45
--- src/usr.bin/mail/Makefile:1.44 Thu Aug 3 14:56:36 2023
+++ src/usr.bin/mail/Makefile Mon Nov 11 11:44:51 2024
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2023/08/03 14:56:36 rin Exp $
+# $NetBSD: Makefile,v 1.45 2024/11/11 11:44:51 martin Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+
USE_FORT?= yes # data-driven bugs?
USE_EDITLINE?=yes
@@ -54,6 +56,7 @@ CPPFLAGS+= -DCHARSET_SUPPORT
LDADD+= -lmagic -llzma -lbz2 -lz
DPADD+= ${LIBMAGIC} ${LIBLZMA} ${LIBBZ2} ${LIBZ}
+PROGDPLIBS+= ${ZSTDDPLIBS}
.endif
.endif
Index: src/usr.bin/unzip/Makefile
diff -u src/usr.bin/unzip/Makefile:1.7 src/usr.bin/unzip/Makefile:1.8
--- src/usr.bin/unzip/Makefile:1.7 Sun Jul 28 12:44:36 2019
+++ src/usr.bin/unzip/Makefile Mon Nov 11 11:44:51 2024
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2019/07/28 12:44:36 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2024/11/11 11:44:51 martin Exp $
.include <bsd.own.mk>
+
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+
PROG= unzip
DPADD+= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBCRYPTO} ${LIBPTHREAD}
LDADD+= -larchive -lz -lbz2 -llzma -lcrypto -lpthread
+PROGDPLIBS+= ${ZSTDDPLIBS}
COPTS.unzip.c += -Wno-format-y2k
