summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-10-23 14:46:23 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-10-23 14:46:48 +0200
commit6f35bcada58b26f127b3a45d45f5bf2f2afad369 (patch)
tree9724c1fb86e8d236895fb29c4b63179d64d8bd10 /net-fs
parentapp-i18n/scim: Drop unused qmake-utils.eclass (diff)
downloadgentoo-6f35bcada58b26f127b3a45d45f5bf2f2afad369.tar.gz
gentoo-6f35bcada58b26f127b3a45d45f5bf2f2afad369.tar.bz2
gentoo-6f35bcada58b26f127b3a45d45f5bf2f2afad369.zip
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@gentoo.org>
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/samba-4.13.0-r1.ebuild13
1 files 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[@]}