From 8e31cdca41fa4bdfd525ee197e5d4cd39a20b425 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 15 Feb 2021 17:15:44 -0500 Subject: [PATCH] sys-apps/systemd: point all gnu-efi options at SYSROOT Closes: https://bugs.gentoo.org/770850 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael Signed-off-by: Mike Gilbert --- sys-apps/systemd/systemd-246-r2.ebuild | 4 +++- sys-apps/systemd/systemd-246.6.ebuild | 2 ++ sys-apps/systemd/systemd-247.2-r4.ebuild | 2 ++ sys-apps/systemd/systemd-9999.ebuild | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-246-r2.ebuild b/sys-apps/systemd/systemd-246-r2.ebuild index a91e932db0d34..1c2b227b30d17 100644 --- a/sys-apps/systemd/systemd-246-r2.ebuild +++ b/sys-apps/systemd/systemd-246-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2020 Gentoo Authors +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -272,6 +272,8 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) -Dhwdb=$(meson_multilib_native_use hwdb) diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild index 52ae9bc4baafb..587173ad06b0e 100644 --- a/sys-apps/systemd/systemd-246.6.ebuild +++ b/sys-apps/systemd/systemd-246.6.ebuild @@ -274,6 +274,8 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) -Dhwdb=$(meson_multilib_native_use hwdb) diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild index abf3150703d8f..5136198339676 100644 --- a/sys-apps/systemd/systemd-247.2-r4.ebuild +++ b/sys-apps/systemd/systemd-247.2-r4.ebuild @@ -279,6 +279,8 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) -Dhwdb=$(meson_multilib_native_use hwdb) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index abf3150703d8f..5136198339676 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -279,6 +279,8 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) -Dhwdb=$(meson_multilib_native_use hwdb)