diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-04 08:14:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-04 08:14:38 +0100 |
| commit | f4e04dc11a0252f8c6c535b7538703974cd06ea0 (patch) | |
| tree | 6ba3be4a2ac2e0f44768521ed50444220fcfec85 /sys-apps/systemd-utils/systemd-utils-255.4.ebuild | |
| parent | ba32ac7204934e0c69e1cc7529edce6efdbeb265 (diff) | |
gentoo auto-resync : 04:04:2024 - 08:14:38
Diffstat (limited to 'sys-apps/systemd-utils/systemd-utils-255.4.ebuild')
| -rw-r--r-- | sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild index a4f60f47e7f3..4c64afbd80c1 100644 --- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild @@ -253,7 +253,7 @@ multilib_src_configure() { } multilib_src_compile() { - local targets=() + local targets=() optional_targets=() if multilib_is_native_abi; then if use boot; then local efi_arch= efi_arch_alt= @@ -275,7 +275,10 @@ multilib_src_compile() { src/boot/efi/addon${efi_arch}.efi.stub ) if [[ -n ${efi_arch_alt} ]]; then - targets+=( + # If we have a multilib toolchain, meson.build will build the + # "alt" arch (ia32). There's no easy way to detect this, so try + # to build it and ignore failure. + optional_targets+=( src/boot/efi/systemd-boot${efi_arch_alt}.efi src/boot/efi/linux${efi_arch_alt}.efi.stub src/boot/efi/addon${efi_arch_alt}.efi.stub @@ -392,9 +395,12 @@ multilib_src_compile() { ) fi fi - if multilib_is_native_abi || use udev; then + if [[ ${#targets[@]} -ne 0 ]]; then meson_src_compile "${targets[@]}" fi + if [[ ${#optional_targets[@]} -ne 0 ]]; then + nonfatal meson_src_compile "${optional_targets[@]}" + fi } multilib_src_test() { |