commit: bb93f0a6faaed5028794f7aaebc5644eb6ca8af5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 01:17:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 01:19:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb93f0a6
sys-fs/zfs: disable systemd on musl
Needed to fix build failures on musl (where we don't
have systemd anyway):
```
zfs-mount-generator.c: In function 'line_worker':
zfs-mount-generator.c:238:24: warning: implicit declaration of function
'strndupa'; did you mean 'strndup'? [-Wimplicit-function-declaration]
238 | pool = strndupa(pool, toktmp - pool);
| ^~~~~~~~
| strndup
zfs-mount-generator.c:238:22: warning: assignment to 'const char *' from 'int'
makes pointer from integer without a cast [-Wint-conversion]
238 | pool = strndupa(pool, toktmp - pool);
| ^
```
Reported-by: Jory A. Pratt <anarchy <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/zfs/zfs-2.1.0-r1.ebuild | 4 ++++
sys-fs/zfs/zfs-2.1.1-r1.ebuild | 5 ++++-
sys-fs/zfs/zfs-9999.ebuild | 5 ++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/sys-fs/zfs/zfs-2.1.0-r1.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
index 9f8ac5af220..2ab356846cf 100644
--- a/sys-fs/zfs/zfs-2.1.0-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
@@ -54,6 +54,10 @@ BDEPEND="virtual/awk
nls? ( sys-devel/gettext )
python? (
dev-python/setuptools[${PYTHON_USEDEP}]
+ || (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/distlib[${PYTHON_USEDEP}]
+ )
)
"
diff --git a/sys-fs/zfs/zfs-2.1.1-r1.ebuild b/sys-fs/zfs/zfs-2.1.1-r1.ebuild
index e1514c972f1..b18fbb26061 100644
--- a/sys-fs/zfs/zfs-2.1.1-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.1.1-r1.ebuild
@@ -180,7 +180,6 @@ src_configure() {
local myconf=(
--bindir="${EPREFIX}/bin"
--enable-shared
- --enable-systemd
--enable-sysvinit
--localstatedir="${EPREFIX}/var"
--sbindir="${EPREFIX}/sbin"
@@ -194,6 +193,10 @@ src_configure() {
--with-systemdunitdir="$(systemd_get_systemunitdir)"
--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
--with-vendor=gentoo
+ # Building zfs-mount-generator.c on musl breaks as strndupa
+ # isn't available. But systemd doesn't support musl anyway, so
+ # just disable building it.
+ $(use_enable !elibc_musl systemd)
$(use_enable debug)
$(use_enable nls)
$(use_enable pam)
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 10db2b452cb..43755044ed6 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -182,7 +182,6 @@ src_configure() {
local myconf=(
--bindir="${EPREFIX}/bin"
--enable-shared
- --enable-systemd
--enable-sysvinit
--localstatedir="${EPREFIX}/var"
--sbindir="${EPREFIX}/sbin"
@@ -196,6 +195,10 @@ src_configure() {
--with-systemdunitdir="$(systemd_get_systemunitdir)"
--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
--with-vendor=gentoo
+ # Building zfs-mount-generator.c on musl breaks as strndupa
+ # isn't available. But systemd doesn't support musl anyway, so
+ # just disable building it.
+ $(use_enable !elibc_musl systemd)
$(use_enable debug)
$(use_enable nls)
$(use_enable pam)
