commit: 6f35bcada58b26f127b3a45d45f5bf2f2afad369 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Oct 23 12:46:23 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Oct 23 12:46:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f35bcad
net-fs/samba: Attempt to fix build with USE="-snapper" Bug: https://bugs.gentoo.org/744502 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-fs/samba/samba-4.13.0-r1.ebuild | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net-fs/samba/samba-4.13.0-r1.ebuild b/net-fs/samba/samba-4.13.0-r1.ebuild index 1ad1af1e7af..db2b144b11b 100644 --- a/net-fs/samba/samba-4.13.0-r1.ebuild +++ b/net-fs/samba/samba-4.13.0-r1.ebuild @@ -148,10 +148,12 @@ pkg_setup() { export DISTCC_DISABLE=1 python-single-r1_pkg_setup + + SHAREDMODS="$(usex snapper '' '!')vfs_snapper" if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" elif use ads ; then - SHAREDMODS="idmap_ad" + SHAREDMODS+=",idmap_ad" fi } @@ -213,7 +215,6 @@ multilib_src_configure() { $(multilib_native_use_with pam) $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') $(multilib_native_use_with quota quotas) - $(multilib_native_usex snapper '' '--with-shared-modules=!vfs_snapper') $(multilib_native_use_with syslog) $(multilib_native_use_with systemd) --systemd-install-services @@ -230,7 +231,11 @@ multilib_src_configure() { --jobs 1 ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]}
