Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Nov 2023 01:52:00 GMT
From:      Ka Ho Ng <khng@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: d030761168eb - main - dirdeps: Update/fix Makefile.depend* for toolchain
Message-ID:  <202311270152.3AR1q0AA009582@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by khng:

URL: https://cgit.FreeBSD.org/src/commit/?id=d030761168ebd624131517855360bb1d62653c9b

commit d030761168ebd624131517855360bb1d62653c9b
Author:     Ka Ho Ng <khng@FreeBSD.org>
AuthorDate: 2023-11-26 09:16:06 +0000
Commit:     Ka Ho Ng <khng@FreeBSD.org>
CommitDate: 2023-11-27 01:50:13 +0000

    dirdeps: Update/fix Makefile.depend* for toolchain
    
    This fixes make pseudo/toolchain.
---
 include/Makefile.depend                              | 1 +
 lib/clang/libllvm/Makefile.depend                    | 1 -
 lib/libc/Makefile.depend                             | 1 +
 lib/libclang_rt/asan/Makefile.depend                 | 3 ++-
 lib/libclang_rt/asan_dynamic/Makefile.depend         | 4 ++--
 lib/libclang_rt/safestack/Makefile.depend            | 2 --
 lib/libclang_rt/stats/Makefile.depend                | 3 ++-
 lib/libclang_rt/ubsan_standalone/Makefile.depend     | 3 ++-
 lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend | 1 +
 lib/libedit/Makefile.depend                          | 2 ++
 lib/libgcc_s/Makefile.depend                         | 1 +
 lib/liblzma/Makefile.depend                          | 1 +
 lib/libthr/Makefile.depend                           | 1 +
 lib/libz/Makefile.depend                             | 1 +
 lib/msun/Makefile.depend                             | 1 +
 lib/ncurses/ncurses/Makefile.depend                  | 2 ++
 lib/ncurses/panel/Makefile.depend                    | 2 ++
 lib/ncurses/tinfo/Makefile.depend                    | 2 ++
 usr.bin/addr2line/Makefile.depend                    | 3 ++-
 usr.bin/clang/clang-tblgen/Makefile.depend           | 8 ++++++--
 usr.bin/clang/clang-tblgen/Makefile.depend.host      | 1 +
 usr.bin/clang/clang/Makefile.depend                  | 7 +++++--
 usr.bin/clang/lld/Makefile.depend                    | 5 +++--
 usr.bin/clang/lldb/Makefile.depend                   | 9 +++++++--
 usr.bin/clang/llvm-objdump/Makefile.depend           | 6 ++++--
 usr.bin/clang/llvm-tblgen/Makefile.depend            | 6 ++++--
 usr.bin/clang/llvm-tblgen/Makefile.depend.host       | 1 +
 usr.bin/cxxfilt/Makefile.depend                      | 3 ++-
 usr.bin/nm/Makefile.depend                           | 1 -
 usr.bin/readelf/Makefile.depend                      | 2 +-
 usr.bin/size/Makefile.depend                         | 1 -
 usr.bin/strings/Makefile.depend                      | 1 -
 32 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/include/Makefile.depend b/include/Makefile.depend
index 2e9fb38de990..346d718d8511 100644
--- a/include/Makefile.depend
+++ b/include/Makefile.depend
@@ -2,6 +2,7 @@
 
 DIRDEPS = \
 	bin/sh.host \
+	usr.bin/awk.host \
 	usr.bin/xinstall.host \
 
 
diff --git a/lib/clang/libllvm/Makefile.depend b/lib/clang/libllvm/Makefile.depend
index df413109f8f9..d2461af845e4 100644
--- a/lib/clang/libllvm/Makefile.depend
+++ b/lib/clang/libllvm/Makefile.depend
@@ -4,7 +4,6 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libc++ \
-	lib/libedit \
 	lib/libexecinfo \
 	lib/libz \
 	lib/msun \
diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend
index 7f0811b3ca91..69e7d1f9c9fd 100644
--- a/lib/libc/Makefile.depend
+++ b/lib/libc/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	include/rpcsvc \
 	lib/${CSU_DIR} \
 	lib/libcompiler_rt \
+	usr.bin/awk.host \
 	usr.bin/yacc.host \
 
 
diff --git a/lib/libclang_rt/asan/Makefile.depend b/lib/libclang_rt/asan/Makefile.depend
index df8ef0ca0c02..2427fe0ab42b 100644
--- a/lib/libclang_rt/asan/Makefile.depend
+++ b/lib/libclang_rt/asan/Makefile.depend
@@ -5,7 +5,8 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/libc++ \
-	lib/ncurses/ncursesw \
+	lib/libmd \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/asan_dynamic/Makefile.depend b/lib/libclang_rt/asan_dynamic/Makefile.depend
index 0bbb1c4aee2a..04eb25a6e4f8 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile.depend
+++ b/lib/libclang_rt/asan_dynamic/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/arpa \
 	include/xlocale \
@@ -10,8 +9,9 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
+	lib/libmd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/safestack/Makefile.depend b/lib/libclang_rt/safestack/Makefile.depend
index df8ef0ca0c02..37aec7f3693e 100644
--- a/lib/libclang_rt/safestack/Makefile.depend
+++ b/lib/libclang_rt/safestack/Makefile.depend
@@ -2,10 +2,8 @@
 
 DIRDEPS = \
 	include \
-	include/arpa \
 	include/xlocale \
 	lib/libc++ \
-	lib/ncurses/ncursesw \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/stats/Makefile.depend b/lib/libclang_rt/stats/Makefile.depend
index df8ef0ca0c02..2427fe0ab42b 100644
--- a/lib/libclang_rt/stats/Makefile.depend
+++ b/lib/libclang_rt/stats/Makefile.depend
@@ -5,7 +5,8 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/libc++ \
-	lib/ncurses/ncursesw \
+	lib/libmd \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile.depend b/lib/libclang_rt/ubsan_standalone/Makefile.depend
index df8ef0ca0c02..2427fe0ab42b 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile.depend
+++ b/lib/libclang_rt/ubsan_standalone/Makefile.depend
@@ -5,7 +5,8 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/libc++ \
-	lib/ncurses/ncursesw \
+	lib/libmd \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend
index 11aba52f82cf..993ab0638f4a 100644
--- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend
+++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend
@@ -1,6 +1,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	include \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index dd06faaab7bf..b9e2f5783b84 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -1,12 +1,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libgcc_s/Makefile.depend b/lib/libgcc_s/Makefile.depend
index 77f8f90c31c3..ae1125555d77 100644
--- a/lib/libgcc_s/Makefile.depend
+++ b/lib/libgcc_s/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index c6f50333f539..b5c5616d53c7 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libmd \
 	lib/libthr \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index 6ef78fac5cbf..40575a605e97 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index 6ef78fac5cbf..40575a605e97 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index 6ef78fac5cbf..40575a605e97 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index dd06faaab7bf..b9e2f5783b84 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -1,12 +1,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index 04dbb4f44313..bafa0452da91 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -1,6 +1,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -8,6 +9,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/ncurses/ncurses \
 	lib/ncurses/tinfo \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/tinfo/Makefile.depend b/lib/ncurses/tinfo/Makefile.depend
index be2eeefbac96..2be5fb18fb00 100644
--- a/lib/ncurses/tinfo/Makefile.depend
+++ b/lib/ncurses/tinfo/Makefile.depend
@@ -1,12 +1,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo.host \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/addr2line/Makefile.depend b/usr.bin/addr2line/Makefile.depend
index 5e1d92875019..b8bf644ceaa1 100644
--- a/usr.bin/addr2line/Makefile.depend
+++ b/usr.bin/addr2line/Makefile.depend
@@ -1,11 +1,12 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
+	lib/libcasper/libcasper \
 	lib/libcompiler_rt \
 	lib/libdwarf \
 	lib/libelf \
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
index dd4c6894d092..336677c3fcb8 100644
--- a/usr.bin/clang/clang-tblgen/Makefile.depend
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend
@@ -1,18 +1,22 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
+	lib/clang/libclang \
 	lib/clang/libllvm \
 	lib/libc \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
+	lib/libexecinfo \
 	lib/libthr \
+	lib/libz \
+	lib/libzstd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/ncurses \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend.host b/usr.bin/clang/clang-tblgen/Makefile.depend.host
index 5ae6e1d38324..8127b03d8797 100644
--- a/usr.bin/clang/clang-tblgen/Makefile.depend.host
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend.host
@@ -3,6 +3,7 @@
 DIRDEPS = \
 	lib/clang/libclangminimal \
 	lib/clang/libllvmminimal \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index bfeda97b8f9e..336677c3fcb8 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -10,10 +9,14 @@ DIRDEPS = \
 	lib/libc \
 	lib/libc++ \
 	lib/libcompiler_rt \
+	lib/libcxxrt \
+	lib/libexecinfo \
 	lib/libthr \
 	lib/libz \
+	lib/libzstd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/ncurses \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/lld/Makefile.depend b/usr.bin/clang/lld/Makefile.depend
index d8fae90875c1..006fa45dd459 100644
--- a/usr.bin/clang/lld/Makefile.depend
+++ b/usr.bin/clang/lld/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -10,10 +9,12 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
+	lib/libexecinfo \
 	lib/libthr \
 	lib/libz \
+	lib/libzstd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/tinfo \
 	usr.bin/clang/llvm-tblgen.host \
 
 
diff --git a/usr.bin/clang/lldb/Makefile.depend b/usr.bin/clang/lldb/Makefile.depend
index 168f0ebd6936..a395caaea392 100644
--- a/usr.bin/clang/lldb/Makefile.depend
+++ b/usr.bin/clang/lldb/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -13,12 +12,18 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libedit \
+	lib/libexecinfo \
+	lib/libkvm \
+	lib/liblua \
+	lib/liblzma \
 	lib/libthr \
 	lib/libz \
+	lib/libzstd \
 	lib/msun \
 	lib/ncurses/ncurses \
-	lib/ncurses/ncursesw \
 	lib/ncurses/panel \
+	lib/ncurses/tinfo \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-objdump/Makefile.depend b/usr.bin/clang/llvm-objdump/Makefile.depend
index 73df5dd192a7..006fa45dd459 100644
--- a/usr.bin/clang/llvm-objdump/Makefile.depend
+++ b/usr.bin/clang/llvm-objdump/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -10,10 +9,13 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
+	lib/libexecinfo \
 	lib/libthr \
 	lib/libz \
+	lib/libzstd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/tinfo \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend
index dd4c6894d092..bb8d5321da66 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile.depend
+++ b/usr.bin/clang/llvm-tblgen/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -10,9 +9,12 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
+	lib/libexecinfo \
 	lib/libthr \
+	lib/libz \
+	lib/libzstd \
 	lib/msun \
-	lib/ncurses/ncursesw \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-tblgen/Makefile.depend.host b/usr.bin/clang/llvm-tblgen/Makefile.depend.host
index e41a35dcde12..2f7a10cf10d6 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile.depend.host
+++ b/usr.bin/clang/llvm-tblgen/Makefile.depend.host
@@ -2,6 +2,7 @@
 
 DIRDEPS = \
 	lib/clang/libllvmminimal \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/cxxfilt/Makefile.depend b/usr.bin/cxxfilt/Makefile.depend
index b3c4b1cf1adc..d2870652b0bf 100644
--- a/usr.bin/cxxfilt/Makefile.depend
+++ b/usr.bin/cxxfilt/Makefile.depend
@@ -1,11 +1,12 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
+	lib/libcasper/libcasper \
 	lib/libcompiler_rt \
 	lib/libelf \
 	lib/libelftc \
diff --git a/usr.bin/nm/Makefile.depend b/usr.bin/nm/Makefile.depend
index 3d7fea5a719a..2f0bc69cb09a 100644
--- a/usr.bin/nm/Makefile.depend
+++ b/usr.bin/nm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/libdwarf \
 	lib/libelf \
 	lib/libelftc \
-	lib/libnv \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/readelf/Makefile.depend b/usr.bin/readelf/Makefile.depend
index 3d7fea5a719a..ddc284fa26a2 100644
--- a/usr.bin/readelf/Makefile.depend
+++ b/usr.bin/readelf/Makefile.depend
@@ -10,7 +10,7 @@ DIRDEPS = \
 	lib/libdwarf \
 	lib/libelf \
 	lib/libelftc \
-	lib/libnv \
+	lib/libz \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/size/Makefile.depend b/usr.bin/size/Makefile.depend
index 3cacb80eb23c..fff85220223b 100644
--- a/usr.bin/size/Makefile.depend
+++ b/usr.bin/size/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libelf \
 	lib/libelftc \
-	lib/libnv \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/strings/Makefile.depend b/usr.bin/strings/Makefile.depend
index 3cacb80eb23c..fff85220223b 100644
--- a/usr.bin/strings/Makefile.depend
+++ b/usr.bin/strings/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libelf \
 	lib/libelftc \
-	lib/libnv \
 
 
 .include <dirdeps.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311270152.3AR1q0AA009582>