From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E76115808B for ; Sun, 17 Apr 2022 20:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B956E09CE; Sun, 17 Apr 2022 20:20:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61192E09CE for ; Sun, 17 Apr 2022 20:20:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22CAF341714 for ; Sun, 17 Apr 2022 20:20:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BF633AF for ; Sun, 17 Apr 2022 20:20:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1650226757.b5575e0caf8da2036079e8be329f346afb170b29.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b5575e0caf8da2036079e8be329f346afb170b29 X-VCS-Branch: master Date: Sun, 17 Apr 2022 20:20:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c1379c62-dd83-4d63-8762-105136f329fa X-Archives-Hash: a6b10de5d34ce292866406b014bdbc6b commit: b5575e0caf8da2036079e8be329f346afb170b29 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 17 20:19:17 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 17 20:19:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5575e0c sys-apps/systemd-utils: wire up src_configure for 'acl' and 'kmod' Signed-off-by: Mike Gilbert gentoo.org> ...utils-250.4-r2.ebuild => systemd-utils-250.4-r3.ebuild} | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild similarity index 97% rename from sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild rename to sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild index f81737003eb0..f6bc25624f70 100644 --- a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild @@ -118,7 +118,6 @@ multilib_src_configure() { local emesonargs=( -Drootprefix="${EPREFIX:-/}" -Dsysvinit-path= - $(meson_native_true acl) $(meson_native_use_bool boot efi) $(meson_native_use_bool boot gnu-efi) $(meson_native_use_bool selinux) @@ -126,7 +125,6 @@ multilib_src_configure() { $(meson_use test tests) $(meson_native_use_bool tmpfiles) $(meson_use udev hwdb) - $(meson_native_use_bool udev kmod) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" @@ -209,6 +207,18 @@ multilib_src_configure() { -Dzstd=false ) + if use tmpfiles || use udev; then + emesonargs+=( $(meson_native_use_bool acl) ) + else + emesonargs+=( -Dacl=false ) + fi + + if use udev; then + emesonargs+=( $(meson_native_use_bool kmod) ) + else + emesonargs+=( -Dkmod=false ) + fi + if use elibc_musl; then # Avoid redefinition of struct ethhdr. append-cppflags -D__UAPI_DEF_ETHHDR=0