Module Name: src
Committed By: christos
Date: Sat Nov 2 22:02:40 UTC 2024
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/external/bsd/file: Makefile.inc
src/external/bsd/file/lib: Makefile
src/external/bsd/libarchive: Makefile.inc
src/external/bsd/libarchive/bin: Makefile.inc
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/zstd/lib: Makefile
src/share/mk: bsd.README bsd.hostprog.mk bsd.prog.mk
Added Files:
src/external/bsd/zstd: Makefile.zstd
Removed Files:
src/external/bsd/zstd/lib: shlib_version
Log Message:
make zstd a private library (for now)
To generate a diff of this commit:
cvs rdiff -u -r1.992 -r1.993 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2480 -r1.2481 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.357 -r1.358 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.452 -r1.453 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.352 -r1.353 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libarchive/bin/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/zstd/Makefile.zstd
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/zstd/lib/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/zstd/lib/shlib_version
cvs rdiff -u -r1.452 -r1.453 src/share/mk/bsd.README
cvs rdiff -u -r1.85 -r1.86 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.351 -r1.352 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.992 src/distrib/sets/lists/base/shl.mi:1.993
--- src/distrib/sets/lists/base/shl.mi:1.992 Wed Oct 30 14:09:16 2024
+++ src/distrib/sets/lists/base/shl.mi Sat Nov 2 18:02:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.992 2024/10/30 18:09:16 christos Exp $
+# $NetBSD: shl.mi,v 1.993 2024/11/02 22:02:38 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -952,9 +952,9 @@
./usr/lib/libzpool.so base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0.0 base-zfs-shlib compatfile,zfs
-./usr/lib/libzstd.so base-sys-shlib compatfile
-./usr/lib/libzstd.so.0 base-sys-shlib compatfile
-./usr/lib/libzstd.so.0.0 base-sys-shlib compatfile
+./usr/lib/libzstd.so base-obsolete obsolete
+./usr/lib/libzstd.so.0 base-obsolete obsolete
+./usr/lib/libzstd.so.0.0 base-obsolete obsolete
./usr/lib/lua/5.1/gpio.so base-obsolete obsolete
./usr/lib/lua/5.1/sqlite.so base-obsolete obsolete
./usr/lib/lua/5.1/syslog.so base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2480 src/distrib/sets/lists/comp/mi:1.2481
--- src/distrib/sets/lists/comp/mi:1.2480 Fri Nov 1 22:43:48 2024
+++ src/distrib/sets/lists/comp/mi Sat Nov 2 18:02:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2480 2024/11/02 02:43:48 riastradh Exp $
+# $NetBSD: mi,v 1.2481 2024/11/02 22:02:38 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3783,10 +3783,10 @@
./usr/include/wctype.h comp-c-include
./usr/include/wordexp.h comp-c-include
./usr/include/zconf.h comp-c-include
-./usr/include/zdict.h comp-c-include
+./usr/include/zdict.h comp-obsolete obsolete
./usr/include/zlib.h comp-c-include
-./usr/include/zstd.h comp-c-include
-./usr/include/zstd_errors.h comp-c-include
+./usr/include/zstd.h comp-obsolete obsolete
+./usr/include/zstd_errors.h comp-obsolete obsolete
./usr/lib base-sys-usr compatdir
./usr/lib/clang/13.0.0/include/sanitizer/allocator_interface.h comp-cxx-include llvm
./usr/lib/clang/13.0.0/include/sanitizer/asan_interface.h comp-cxx-include llvm
@@ -4398,8 +4398,8 @@
./usr/lib/libzfs_p.a comp-zfs-proflib compatfile,zfs,profile
./usr/lib/libzpool.a comp-zfs-lib compatfile,zfs
./usr/lib/libzpool_p.a comp-zfs-proflib compatfile,zfs,profile
-./usr/lib/libzstd.a comp-c-lib compatfile
-./usr/lib/libzstd_p.a comp-c-proflib compatfile,profile
+./usr/lib/libzstd.a comp-obsolete obsolete
+./usr/lib/libzstd_p.a comp-obsolete obsolete
./usr/lib/pkgconfig comp-c-lib
./usr/lib/pkgconfig/atf-c++.pc comp-atf-lib atf,share
./usr/lib/pkgconfig/atf-c.pc comp-atf-lib atf,share
@@ -4414,7 +4414,7 @@
./usr/lib/pkgconfig/liblzma.pc comp-c-lib share
./usr/lib/pkgconfig/libssl.pc comp-crypto-lib share
./usr/lib/pkgconfig/libuv.pc comp-obsolete share,obsolete
-./usr/lib/pkgconfig/libzstd.pc comp-c-lib
+./usr/lib/pkgconfig/libzstd.pc comp-obsolete obsolete
./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share
./usr/lib/pkgconfig/openssl.pc comp-crypto-lib share
./usr/lib/pkgconfig/sqlite3.pc comp-c-lib
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.357 src/distrib/sets/lists/comp/shl.mi:1.358
--- src/distrib/sets/lists/comp/shl.mi:1.357 Wed Oct 30 14:09:17 2024
+++ src/distrib/sets/lists/comp/shl.mi Sat Nov 2 18:02:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.357 2024/10/30 18:09:17 christos Exp $
+# $NetBSD: shl.mi,v 1.358 2024/11/02 22:02:38 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -296,7 +296,7 @@
./usr/lib/libzfs_core_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libzfs_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libzpool_pic.a comp-zfs-piclib compatfile,picinstall,zfs
-./usr/lib/libzstd_pic.a comp-c-piclib compatfile,picinstall
+./usr/lib/libzstd_pic.a comp-obsolete obsolete
./usr/libexec/liblto_plugin.so comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0 comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0.1 comp-c-bin gcc
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.452 src/distrib/sets/lists/debug/mi:1.453
--- src/distrib/sets/lists/debug/mi:1.452 Wed Oct 30 14:09:17 2024
+++ src/distrib/sets/lists/debug/mi Sat Nov 2 18:02:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.452 2024/10/30 18:09:17 christos Exp $
+# $NetBSD: mi,v 1.453 2024/11/02 22:02:38 christos Exp $
#
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
@@ -282,7 +282,7 @@
./usr/lib/libzfs_core_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libzfs_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libzpool_g.a comp-c-debuglib debuglib,compatfile,zfs
-./usr/lib/libzstd_g.a comp-c-debuglib debuglib,compatfile
+./usr/lib/libzstd_g.a comp-obsolete obsolete
./usr/libdata/debug/bin/cat.debug comp-util-debug debug
./usr/libdata/debug/bin/chio.debug comp-util-debug debug
./usr/libdata/debug/bin/chmod.debug comp-util-debug debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.352 src/distrib/sets/lists/debug/shl.mi:1.353
--- src/distrib/sets/lists/debug/shl.mi:1.352 Wed Oct 30 14:09:17 2024
+++ src/distrib/sets/lists/debug/shl.mi Sat Nov 2 18:02:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.352 2024/10/30 18:09:17 christos Exp $
+# $NetBSD: shl.mi,v 1.353 2024/11/02 22:02:38 christos Exp $
#
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/lib/libgcc_eh_g.a comp-c-debuglib debuglib,compatfile,gcc
@@ -318,7 +318,7 @@
./usr/libdata/debug/usr/lib/libzfs.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libzfs_core.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libzpool.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
-./usr/libdata/debug/usr/lib/libzstd.so.0.0.debug comp-sys-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libzstd.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/named/filter-aaaa.so.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/npf/ext_log.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
./usr/libdata/debug/usr/lib/npf/ext_normalise.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
Index: src/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.8 src/external/bsd/file/Makefile.inc:1.9
--- src/external/bsd/file/Makefile.inc:1.8 Wed Oct 30 14:09:18 2024
+++ src/external/bsd/file/Makefile.inc Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2024/10/30 18:09:18 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2024/11/02 22:02:39 christos Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -16,14 +16,18 @@ MAGIC?= ${MFILESDIR}/magic
VERSION != ${TOOL_SED} -ne "s/^PACKAGE_VERSION='\([^']*\)'/\1/p" ${DIST}/configure
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+
CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_CONFIG_H -DQUICK -DBUILTIN_ELF \
-DELFCORE -DVERSION='"${VERSION}"'
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
+CPPFLAGS+= ${ZSTDCPPFLAGS}
.PATH: ${DIST}/src ${DIST}/doc
+
DPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
-DPLIBS+= zstd ${NETBSDSRCDIR}/external/bsd/zstd/lib
+DPLIBS+= ${ZSTDDPLIBS}
DPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
DPLIBS+= z ${NETBSDSRCDIR}/lib/libz
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.18 src/external/bsd/file/lib/Makefile:1.19
--- src/external/bsd/file/lib/Makefile:1.18 Fri Aug 18 15:00:11 2023
+++ src/external/bsd/file/lib/Makefile Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/08/18 19:00:11 christos Exp $
+# $NetBSD: Makefile,v 1.19 2024/11/02 22:02:39 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -37,6 +37,7 @@ INCSDIR= /usr/include
COPTS.softmagic.c+= -Wno-format-nonliteral
COPTS.readelf.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
+CPPFLAGS+= ${ZSTDCPPFLAGS}
magic.c: magic.h
magic.h: magic.h.in
Index: src/external/bsd/libarchive/Makefile.inc
diff -u src/external/bsd/libarchive/Makefile.inc:1.3 src/external/bsd/libarchive/Makefile.inc:1.4
--- src/external/bsd/libarchive/Makefile.inc:1.3 Thu Apr 20 16:34:24 2017
+++ src/external/bsd/libarchive/Makefile.inc Sat Nov 2 18:02:39 2024
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/04/20 20:34:24 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2024/11/02 22:02:39 christos Exp $
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
+
USE_FORT?= yes # complex string handling
LIBARCHIVEDIR= ${NETBSDSRCDIR}/external/bsd/libarchive/dist
CPPFLAGS+= -I${NETBSDSRCDIR}/external/bsd/libarchive/include
-CPPFLAGS+= -DPLATFORM_CONFIG_H=\"config_netbsd.h\"
+CPPFLAGS+= -DPLATFORM_CONFIG_H=\"config_netbsd.h\" ${ZSTDCPPFLAGS}
LIBARCHIVE_FE_DIR!= cd ${.PARSEDIR}/lib/libarchive_fe && ${PRINTOBJDIR}
LIBARCHIVE_FE= ${LIBARCHIVE_FE_DIR}/libarchive_fe.a
Index: src/external/bsd/libarchive/bin/Makefile.inc
diff -u src/external/bsd/libarchive/bin/Makefile.inc:1.6 src/external/bsd/libarchive/bin/Makefile.inc:1.7
--- src/external/bsd/libarchive/bin/Makefile.inc:1.6 Thu Oct 31 20:00:14 2024
+++ src/external/bsd/libarchive/bin/Makefile.inc Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2024/11/01 00:00:14 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2024/11/02 22:02:39 christos Exp $
.include "../Makefile.inc"
@@ -12,5 +12,6 @@ DPADD+= ${LIBARCHIVE_FE} ${LIBARCHIVE} $
DPADD+= ${LIBBZ2} ${LIBLZMA} ${LIBZ} ${LIBCRYPTO} ${LIBPTHREAD}
LDADD+= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lexpat -lzstd
LDADD+= -lbz2 -llzma -lz -lcrypto -lpthread
+PROGDPLIBS+= ${ZSTDDPLIBS}
CPPFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.18 src/external/bsd/libarchive/lib/libarchive/Makefile:1.19
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.18 Wed Oct 30 14:09:18 2024
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2024/10/30 18:09:18 christos Exp $
+# $NetBSD: Makefile,v 1.19 2024/11/02 22:02:39 christos Exp $
.include <bsd.init.mk>
@@ -10,7 +10,7 @@ LIB= archive
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
- zstd ${NETBSDSRCDIR}/external/bsd/zstd/lib \
+ ${ZSTDDPLIBS} \
lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
z ${NETBSDSRCDIR}/lib/libz
Index: src/external/bsd/zstd/lib/Makefile
diff -u src/external/bsd/zstd/lib/Makefile:1.3 src/external/bsd/zstd/lib/Makefile:1.4
--- src/external/bsd/zstd/lib/Makefile:1.3 Tue Oct 29 16:51:37 2024
+++ src/external/bsd/zstd/lib/Makefile Sat Nov 2 18:02:40 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2024/10/29 20:51:37 christos Exp $
+# $NetBSD: Makefile,v 1.4 2024/11/02 22:02:40 christos Exp $
+LIBISPRIVATE=pic
NOLINT=yes # XXX
WARNS?= 4
.include <bsd.init.mk>
@@ -56,10 +57,12 @@ LINTFLAGS += -X 96,117,129,161,174,214,2
CPPFLAGS+= -I${SRCDIR} -DZSTD_MULTITHREAD
+LIBDPLIBS += pthread ${NETBSDSRCDIR}/lib/libpthread
+
+.if ${LIBISPRIVATE:Uno} == "no"
INCS= zdict.h zstd.h zstd_errors.h
INCSDIR= /usr/include
-LIBDPLIBS += pthread ${NETBSDSRCDIR}/lib/libpthread
PC=libzstd.pc
FILES+= ${PC}
@@ -82,5 +85,6 @@ ${PC}: ${PC}.in
-e s,@INCLUDEDIR@,/usr/include, -e s,@LIBDIR@,/usr/lib, \
-e s,@LIBS_PRIVATE@,, \
< ${.ALLSRC} > ${.TARGET})
+.endif
.include <bsd.lib.mk>
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.452 src/share/mk/bsd.README:1.453
--- src/share/mk/bsd.README:1.452 Thu Oct 31 19:56:44 2024
+++ src/share/mk/bsd.README Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.452 2024/10/31 23:56:44 christos Exp $
+# $NetBSD: bsd.README,v 1.453 2024/11/02 22:02:39 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1415,7 +1415,6 @@ DPADD Additional dependencies for the p
LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a
LIBY?= ${DESTDIR}/usr/lib/liby.a
LIBZ?= ${DESTDIR}/usr/lib/libz.a
- LIBZSTD?= ${DESTDIR}/usr/lib/libzstd.a
The following c startup files.
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.85 src/share/mk/bsd.hostprog.mk:1.86
--- src/share/mk/bsd.hostprog.mk:1.85 Thu Oct 31 19:56:44 2024
+++ src/share/mk/bsd.hostprog.mk Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.85 2024/10/31 23:56:44 christos Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.86 2024/11/02 22:02:39 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.hostinit.mk>
@@ -72,7 +72,6 @@ LIBUTIL?= /usr/lib/libutil.a
LIBWRAP?= /usr/lib/libwrap.a
LIBY?= /usr/lib/liby.a
LIBZ?= /usr/lib/libz.a
-LIBZSTD?= /usr/lib/libzstd.a
##### rump file system modules
LIBRUMPFS_CD9660FS?= /usr/lib/librumpfs_cd9660fs.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.351 src/share/mk/bsd.prog.mk:1.352
--- src/share/mk/bsd.prog.mk:1.351 Thu Oct 31 19:56:44 2024
+++ src/share/mk/bsd.prog.mk Sat Nov 2 18:02:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.351 2024/10/31 23:56:44 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.352 2024/11/02 22:02:39 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -192,8 +192,7 @@ _LIBLIST=\
wind \
wrap \
y \
- z \
- zstd
+ z
.for _lib in ${_LIBLIST}
.ifndef LIB${_lib:tu}
Added files:
Index: src/external/bsd/zstd/Makefile.zstd
diff -u /dev/null src/external/bsd/zstd/Makefile.zstd:1.1
--- /dev/null Sat Nov 2 18:02:40 2024
+++ src/external/bsd/zstd/Makefile.zstd Sat Nov 2 18:02:39 2024
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.zstd,v 1.1 2024/11/02 22:02:39 christos Exp $
+ZSTD := ${.PARSEDIR}
+ZSTDCPPFLAGS= -I${ZSTD}/dist/lib
+
+ZSTDDPLIBS= zstd ${ZSTD}/lib
