From 6186705195b491b88146293986d422ecbbe07a92 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 25 Sep 2023 07:15:38 +0000 Subject: [PATCH] sys-apps/dtc: Sync with Gentoo It's from Gentoo commit 0428966db63c13fc0142f0500e5c44895793eb37. --- .../third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild | 4 +++- .../third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild index a56040b060..2cc4e96840 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild @@ -63,12 +63,14 @@ src_prepare() { src_configure() { local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) -Dtools=true -Dvalgrind=disabled # only used for some tests $(meson_feature python) $(meson_feature yaml) ) + # bug #909366 + use static-libs && emesonargs+=( -Dstatic-build=true ) + meson_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild index ef30384edb..c962e61576 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild @@ -58,12 +58,14 @@ src_prepare() { src_configure() { local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) -Dtools=true -Dvalgrind=disabled # only used for some tests $(meson_feature python) $(meson_feature yaml) ) + # bug #909366 + use static-libs && emesonargs+=( -Dstatic-build=true ) + meson_src_configure }