commit: ff8a7f282c85e8d142e0fd8a5585c6d4c6ffa0ba Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 16 09:09:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 16 09:11:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8a7f28
net-fs/samba: always build ADS support, not just for multilib I can't explain the problem better than Honza did on the bug, at https://bugs.gentoo.org/941578#c13. But in summary, the upstream code doesn't expect LDAP to be built without ADS. The upstream bug filed by Ben hasn't had a response yet, so let's stop building ADS for only the native ABI and do it generally. (It's not clear why it was native only and it's kind of dubious for anything used by the library code anyhow.) Bug: https://bugzilla.samba.org/show_bug.cgi?id=15741 Closes: https://bugs.gentoo.org/941578 Thanks-to: Honza Macháček <Hloupy.Honza <AT> centrum.cz> Signed-off-by: Sam James <sam <AT> gentoo.org> net-fs/samba/samba-4.21.0.ebuild | 4 ++-- net-fs/samba/samba-4.21.1.ebuild | 2 +- net-fs/samba/samba-4.21.4.ebuild | 2 +- net-fs/samba/samba-4.21.5.ebuild | 2 +- net-fs/samba/samba-4.22.0.ebuild | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-fs/samba/samba-4.21.0.ebuild b/net-fs/samba/samba-4.21.0.ebuild index fb93abd59244..b9df5502b341 100644 --- a/net-fs/samba/samba-4.21.0.ebuild +++ b/net-fs/samba/samba-4.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -262,7 +262,6 @@ multilib_src_configure() { --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with ads) $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) @@ -287,6 +286,7 @@ multilib_src_configure() { $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with ads) $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data) diff --git a/net-fs/samba/samba-4.21.1.ebuild b/net-fs/samba/samba-4.21.1.ebuild index 71fd45394a02..364c3c45f74c 100644 --- a/net-fs/samba/samba-4.21.1.ebuild +++ b/net-fs/samba/samba-4.21.1.ebuild @@ -266,7 +266,6 @@ multilib_src_configure() { --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with ads) $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) @@ -291,6 +290,7 @@ multilib_src_configure() { $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with ads) $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data) diff --git a/net-fs/samba/samba-4.21.4.ebuild b/net-fs/samba/samba-4.21.4.ebuild index 71fd45394a02..364c3c45f74c 100644 --- a/net-fs/samba/samba-4.21.4.ebuild +++ b/net-fs/samba/samba-4.21.4.ebuild @@ -266,7 +266,6 @@ multilib_src_configure() { --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with ads) $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) @@ -291,6 +290,7 @@ multilib_src_configure() { $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with ads) $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data) diff --git a/net-fs/samba/samba-4.21.5.ebuild b/net-fs/samba/samba-4.21.5.ebuild index 71fd45394a02..364c3c45f74c 100644 --- a/net-fs/samba/samba-4.21.5.ebuild +++ b/net-fs/samba/samba-4.21.5.ebuild @@ -266,7 +266,6 @@ multilib_src_configure() { --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with ads) $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) @@ -291,6 +290,7 @@ multilib_src_configure() { $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with ads) $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data) diff --git a/net-fs/samba/samba-4.22.0.ebuild b/net-fs/samba/samba-4.22.0.ebuild index 7be7132823d1..12d56bffa665 100644 --- a/net-fs/samba/samba-4.22.0.ebuild +++ b/net-fs/samba/samba-4.22.0.ebuild @@ -266,7 +266,6 @@ multilib_src_configure() { --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with ads) $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) @@ -291,6 +290,7 @@ multilib_src_configure() { $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with ads) $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data)
