commit:     0428966db63c13fc0142f0500e5c44895793eb37
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 02:19:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 02:19:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0428966d

sys-apps/dtc: fix static build

Closes: https://bugs.gentoo.org/909366
Thanks-to: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/dtc/dtc-1.7.0.ebuild | 4 +++-
 sys-apps/dtc/dtc-9999.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
index a56040b060aa..2cc4e96840ad 100644
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ b/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/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index ef30384edbe0..c962e6157627 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/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
 }

Reply via email to