summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2021-02-15 17:15:44 -0500
committerMike Gilbert <floppym@gentoo.org>2021-02-15 18:23:58 -0500
commit8e31cdca41fa4bdfd525ee197e5d4cd39a20b425 (patch)
tree665b5a9a1b58e6840fa7d4c080165d07078db6f6 /sys-apps/systemd
parentmeson.eclass: define objcopy (diff)
downloadgentoo-8e31cdca41fa4bdfd525ee197e5d4cd39a20b425.tar.gz
gentoo-8e31cdca41fa4bdfd525ee197e5d4cd39a20b425.tar.bz2
gentoo-8e31cdca41fa4bdfd525ee197e5d4cd39a20b425.zip
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 <fedora.dm0@gmail.com> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/systemd-246-r2.ebuild4
-rw-r--r--sys-apps/systemd/systemd-246.6.ebuild2
-rw-r--r--sys-apps/systemd/systemd-247.2-r4.ebuild2
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild2
4 files changed, 9 insertions, 1 deletions
diff --git a/sys-apps/systemd/systemd-246-r2.ebuild b/sys-apps/systemd/systemd-246-r2.ebuild
index a91e932db0d..1c2b227b30d 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 52ae9bc4baa..587173ad06b 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 abf3150703d..51361983396 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 abf3150703d..51361983396 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)