From f189805dcc808b150370a0345bc2047ff1dde401 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 24 Feb 2016 17:18:43 +0000 Subject: [PATCH] DIRDEPS_BUILD: Add some missing build dependencies for kerberos5. Sponsored by: EMC / Isilon Storage Division --- kerberos5/lib/libasn1/Makefile.depend | 2 ++ kerberos5/lib/libgssapi_krb5/Makefile.depend | 1 + kerberos5/lib/libgssapi_spnego/Makefile.depend | 1 + kerberos5/lib/libhdb/Makefile.depend | 2 ++ kerberos5/lib/libheimntlm/Makefile.depend | 1 + kerberos5/lib/libhx509/Makefile.depend | 2 ++ kerberos5/lib/libkadm5clnt/Makefile.depend | 1 + kerberos5/lib/libkadm5srv/Makefile.depend | 1 + kerberos5/lib/libkafs5/Makefile.depend | 1 + kerberos5/lib/libkrb5/Makefile.depend | 1 + kerberos5/lib/libroken/Makefile.depend | 1 + kerberos5/lib/libvers/Makefile.depend | 1 + kerberos5/lib/libwind/Makefile.depend | 1 + kerberos5/libexec/ipropd-master/Makefile.depend | 1 + kerberos5/libexec/ipropd-slave/Makefile.depend | 1 + kerberos5/libexec/kdigest/Makefile.depend | 1 + kerberos5/tools/asn1_compile/Makefile.depend | 1 + kerberos5/tools/slc/Makefile.depend | 1 + kerberos5/usr.bin/hxtool/Makefile.depend | 1 + kerberos5/usr.bin/kadmin/Makefile.depend | 1 + kerberos5/usr.bin/kcc/Makefile.depend | 1 + kerberos5/usr.sbin/iprop-log/Makefile.depend | 2 ++ kerberos5/usr.sbin/ktutil/Makefile.depend | 1 + targets/pseudo/hosttools/Makefile.depend | 11 +++++++++++ 24 files changed, 38 insertions(+) diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend index b94475929eb5..78e3d5618fb7 100644 --- a/kerberos5/lib/libasn1/Makefile.depend +++ b/kerberos5/lib/libasn1/Makefile.depend @@ -8,10 +8,12 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libroken \ + kerberos5/tools/asn1_compile.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend index 4d9610a08150..264a2daee673 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile.depend +++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend @@ -19,6 +19,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libgssapi \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend index 43eaf3d778f1..a03b7065295f 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile.depend +++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend @@ -11,6 +11,7 @@ DIRDEPS = \ kerberos5/lib/libheimbase \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ + kerberos5/tools/asn1_compile.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend index 227302eaf1c5..8c82131cfabd 100644 --- a/kerberos5/lib/libhdb/Makefile.depend +++ b/kerberos5/lib/libhdb/Makefile.depend @@ -13,12 +13,14 @@ DIRDEPS = \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libwind \ + kerberos5/tools/asn1_compile.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libsqlite3 \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend index 9e9f6318ea2a..c4c6c86a2c1a 100644 --- a/kerberos5/lib/libheimntlm/Makefile.depend +++ b/kerberos5/lib/libheimntlm/Makefile.depend @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend index c422d1785da8..af84b7fc7ad4 100644 --- a/kerberos5/lib/libhx509/Makefile.depend +++ b/kerberos5/lib/libhx509/Makefile.depend @@ -10,11 +10,13 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libroken \ kerberos5/lib/libwind \ + kerberos5/tools/asn1_compile.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ usr.bin/yacc.host \ diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend index f1c4cb545ed9..c3c91fefb57f 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile.depend +++ b/kerberos5/lib/libkadm5clnt/Makefile.depend @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend index 1b247840d6cc..9829b8deecac 100644 --- a/kerberos5/lib/libkadm5srv/Makefile.depend +++ b/kerberos5/lib/libkadm5srv/Makefile.depend @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend index 5649824e627b..4f22e41e0d32 100644 --- a/kerberos5/lib/libkafs5/Makefile.depend +++ b/kerberos5/lib/libkafs5/Makefile.depend @@ -14,6 +14,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libkrb5/Makefile.depend b/kerberos5/lib/libkrb5/Makefile.depend index 0adc7b648611..f86ed7addf3a 100644 --- a/kerberos5/lib/libkrb5/Makefile.depend +++ b/kerberos5/lib/libkrb5/Makefile.depend @@ -19,6 +19,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend index e280c94bcfea..1d555974a3b1 100644 --- a/kerberos5/lib/libroken/Makefile.depend +++ b/kerberos5/lib/libroken/Makefile.depend @@ -7,6 +7,7 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ + kerberos5/tools/make-roken.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ diff --git a/kerberos5/lib/libvers/Makefile.depend b/kerberos5/lib/libvers/Makefile.depend index ae841b8d54e8..042af96739a2 100644 --- a/kerberos5/lib/libvers/Makefile.depend +++ b/kerberos5/lib/libvers/Makefile.depend @@ -5,6 +5,7 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ + kerberos5/tools/make-roken.host \ .include diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend index 87bc4c144c56..6043ca75c12b 100644 --- a/kerberos5/lib/libwind/Makefile.depend +++ b/kerberos5/lib/libwind/Makefile.depend @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend index 35482e283925..19e007eef3bd 100644 --- a/kerberos5/libexec/ipropd-master/Makefile.depend +++ b/kerberos5/libexec/ipropd-master/Makefile.depend @@ -25,6 +25,7 @@ DIRDEPS = \ lib/libsqlite3 \ lib/libthr \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend index bbde92344346..69569ff9dc22 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile.depend +++ b/kerberos5/libexec/ipropd-slave/Makefile.depend @@ -25,6 +25,7 @@ DIRDEPS = \ lib/libsqlite3 \ lib/libthr \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend index a87c8e0f7d00..44985c6222af 100644 --- a/kerberos5/libexec/kdigest/Makefile.depend +++ b/kerberos5/libexec/kdigest/Makefile.depend @@ -18,6 +18,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend index cdec7692f5fc..5e815c037300 100644 --- a/kerberos5/tools/asn1_compile/Makefile.depend +++ b/kerberos5/tools/asn1_compile/Makefile.depend @@ -9,6 +9,7 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/tools/make-roken.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ diff --git a/kerberos5/tools/slc/Makefile.depend b/kerberos5/tools/slc/Makefile.depend index f5859535d068..7ef721db940d 100644 --- a/kerberos5/tools/slc/Makefile.depend +++ b/kerberos5/tools/slc/Makefile.depend @@ -9,6 +9,7 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/tools/make-roken.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ diff --git a/kerberos5/usr.bin/hxtool/Makefile.depend b/kerberos5/usr.bin/hxtool/Makefile.depend index b39235f1b58e..7743002a641b 100644 --- a/kerberos5/usr.bin/hxtool/Makefile.depend +++ b/kerberos5/usr.bin/hxtool/Makefile.depend @@ -13,6 +13,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend index ba398797cab2..14951cd9ebb6 100644 --- a/kerberos5/usr.bin/kadmin/Makefile.depend +++ b/kerberos5/usr.bin/kadmin/Makefile.depend @@ -19,6 +19,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend index 385f604b096d..23c39d488274 100644 --- a/kerberos5/usr.bin/kcc/Makefile.depend +++ b/kerberos5/usr.bin/kcc/Makefile.depend @@ -17,6 +17,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend index 5d0a242f3ae1..559b96e7022e 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile.depend +++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend @@ -18,6 +18,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ @@ -28,6 +29,7 @@ DIRDEPS = \ lib/libthr \ lib/ncurses/ncursesw \ secure/lib/libcrypto \ + usr.bin/compile_et.host \ .include diff --git a/kerberos5/usr.sbin/ktutil/Makefile.depend b/kerberos5/usr.sbin/ktutil/Makefile.depend index 4d47a999a840..75d5497d343e 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile.depend +++ b/kerberos5/usr.sbin/ktutil/Makefile.depend @@ -17,6 +17,7 @@ DIRDEPS = \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ kerberos5/lib/libwind \ + kerberos5/tools/slc.host \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ diff --git a/targets/pseudo/hosttools/Makefile.depend b/targets/pseudo/hosttools/Makefile.depend index ea364f13b7f1..e8dd16c37d48 100644 --- a/targets/pseudo/hosttools/Makefile.depend +++ b/targets/pseudo/hosttools/Makefile.depend @@ -2,6 +2,10 @@ # This file is not autogenerated - take care! +.if !defined(MK_KERBEROS) +.include +.endif + DIRDEPS = \ lib/clang/include.host \ lib/libc++.host \ @@ -20,6 +24,13 @@ DIRDEPS = \ usr.bin/xlint/xlint.host \ usr.sbin/config.host \ +.if ${MK_KERBEROS} != "no" +DIRDEPS+= \ + kerberos5/tools/asn1_compile.host \ + kerberos5/tools/make-roken.host \ + usr.bin/compile_et.host \ + +.endif .include