Module Name: src
Committed By: mrg
Date: Sat Jan 11 01:23:56 UTC 2025
Modified Files:
src/lib: Makefile
Log Message:
move libzstd into the earlier depend group.
both libarchive and libfile depend upon libzstd, but they were all in the
same group and if you try hard enough, you can trigger a build failure in
one of them if it hasn't finished building libzstd yet.
(surprised no one else hit this since october 30.)
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.303 src/lib/Makefile:1.304
--- src/lib/Makefile:1.303 Wed Oct 30 18:09:18 2024
+++ src/lib/Makefile Sat Jan 11 01:23:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.303 2024/10/30 18:09:18 christos Exp $
+# $NetBSD: Makefile,v 1.304 2025/01/11 01:23:56 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -183,6 +183,8 @@ SUBDIR+= ../external/apache2/llvm/includ
SUBDIR+= ../external/mit/libcbor/lib
SUBDIR+= ../external/mit/libuv/lib
+
+SUBDIR+= ../external/bsd/zstd/lib
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
@@ -202,10 +204,9 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
SUBDIR+= ../external/apache2/llvm/librt
.endif
-SUBDIR+= ../external/bsd/zstd/lib
SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz, zstd
-SUBDIR+= ../external/bsd/file/lib # depends on libz, libbz2, libxz
+SUBDIR+= ../external/bsd/file/lib # depends on libz, libbz2, libxz, zstd
.if (${MKNPF} != "no")
SUBDIR+= npf # depends on libnpf