diff options
| -rw-r--r-- | eclass/meson.eclass | 2 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-246-r2.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-246.6.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-247.2-r4.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 2 |
5 files changed, 11 insertions, 1 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 67b7ca831fd2..d0ce5adb3558 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -169,6 +169,7 @@ _meson_create_cross_file() { llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' nm = $(_meson_env_array "$(tc-getNM)") objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") + objcopy = $(_meson_env_array "$(tc-getOBJCOPY)") objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") pkgconfig = '$(tc-getPKG_CONFIG)' strip = $(_meson_env_array "$(tc-getSTRIP)") @@ -220,6 +221,7 @@ _meson_create_native_file() { llvm-config = '$(tc-getBUILD_PROG LLVM_CONFIG llvm-config)' nm = $(_meson_env_array "$(tc-getBUILD_NM)") objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)") + objcopy = $(_meson_env_array "$(tc-getBUILD_OBJCOPY)") objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)") pkgconfig = '$(tc-getBUILD_PKG_CONFIG)' strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") diff --git a/sys-apps/systemd/systemd-246-r2.ebuild b/sys-apps/systemd/systemd-246-r2.ebuild index a91e932db0d3..1c2b227b30d1 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 52ae9bc4baaf..587173ad06b0 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 abf3150703d8..513619833967 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 abf3150703d8..513619833967 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) |