summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-02-10 18:06:10 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-10 18:09:53 +0100
commit25de6a057274984d79e3fdeaa0a2e5bc9091f63d (patch)
treeaa4e05bbfe56ed22505a882e40141823a5018ea7
parent4a2af2fe4182bcddf390b5cdcf104f5a4b4702b2 (diff)
downloadptxdist-25de6a057274984d79e3fdeaa0a2e5bc9091f63d.tar.gz
ptxdist-25de6a057274984d79e3fdeaa0a2e5bc9091f63d.tar.xz
krb5: drop some not needed dependencies
libedit is not used with the system libss. And libss is only needed for the admin tools. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/krb5.in5
-rw-r--r--rules/krb5.make4
2 files changed, 4 insertions, 5 deletions
diff --git a/rules/krb5.in b/rules/krb5.in
index 2af9d2e0e..a07ceacd1 100644
--- a/rules/krb5.in
+++ b/rules/krb5.in
@@ -5,10 +5,9 @@ menuconfig KRB5
select HOST_E2FSPROGS
select E2FSPROGS
select E2FSPROGS_LIBCOM_ERR
- select E2FSPROGS_LIBSS
+ select E2FSPROGS_LIBSS if KRB5_ADMIN_TOOLS
+ select KEYUTILS if KRB5_CLIENT_TOOLS
select OPENSSL
- select LIBEDIT
- select KEYUTILS if KRB5_CLIENT_TOOLS
prompt "Kerberos"
help
This is the MIT implementation of the Kerberos network authentication
diff --git a/rules/krb5.make b/rules/krb5.make
index 934bd7e10..9f5e38e19 100644
--- a/rules/krb5.make
+++ b/rules/krb5.make
@@ -60,7 +60,7 @@ KRB5_CONF_OPT := \
--enable-pkinit \
--without-size-optimizations \
--with-system-et \
- --with-system-ss \
+ --$(call ptx/wwo,PTXCONF_KRB5_ADMIN_TOOLS)-system-ss \
--without-system-db \
--without-netlib \
--without-hesiod \
@@ -71,7 +71,7 @@ KRB5_CONF_OPT := \
--with-prng-alg=fortuna \
--with-pkinit-crypto-impl=openssl \
--with-tls-impl=openssl \
- --with-libedit \
+ --without-libedit \
--without-readline \
--without-system-verto