summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-01-24 22:00:12 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-01-24 22:00:36 +0100
commit7ad932cf204b2a7ccf65b6be853f23c4450eb732 (patch)
tree70db31cfde6856b7a14297308222006e27838c6b /net-fs
parentdev-python/logilab-common: stable on alpha/arm (diff)
downloadgentoo-7ad932cf204b2a7ccf65b6be853f23c4450eb732.tar.gz
gentoo-7ad932cf204b2a7ccf65b6be853f23c4450eb732.tar.bz2
gentoo-7ad932cf204b2a7ccf65b6be853f23c4450eb732.zip
net-fs/samba: Always use bundled heimdal if no system-krb was enabled.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/samba-4.5.4.ebuild3
-rw-r--r--net-fs/samba/samba-4.6.0_rc1.ebuild3
2 files changed, 2 insertions, 4 deletions
diff --git a/net-fs/samba/samba-4.5.4.ebuild b/net-fs/samba/samba-4.5.4.ebuild
index e0a0e03065d..3a493e22fc3 100644
--- a/net-fs/samba/samba-4.5.4.ebuild
+++ b/net-fs/samba/samba-4.5.4.ebuild
@@ -132,9 +132,8 @@ multilib_src_configure() {
# when specifying libs for samba build you must append NONE to the end to
# stop it automatically including things
local bundled_libs="NONE"
- if use addc && ! use system-heimdal ; then
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- #bundled_libs="heimdal,NONE"
fi
local myconf=()
diff --git a/net-fs/samba/samba-4.6.0_rc1.ebuild b/net-fs/samba/samba-4.6.0_rc1.ebuild
index 093f6f7ff70..56a673c287e 100644
--- a/net-fs/samba/samba-4.6.0_rc1.ebuild
+++ b/net-fs/samba/samba-4.6.0_rc1.ebuild
@@ -133,9 +133,8 @@ multilib_src_configure() {
# when specifying libs for samba build you must append NONE to the end to
# stop it automatically including things
local bundled_libs="NONE"
- if use addc && ! use system-heimdal ; then
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- #bundled_libs="heimdal,NONE"
fi
local myconf=()