commit:     f4aca471832025475b501896d8c778b0b4489ae5
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 16:38:41 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue May  6 17:40:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4aca471

Revert "sys-apps/dtc: fix static build"

This reverts commit 0428966db63c13fc0142f0500e5c44895793eb37.

At least, revert it in live. The entire commit was totally bogus. The
build option in question just determined whether to build using
LDFLAGS="-static". Upstream didn't support building without static libs
at all, until

https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=dd1b3e532d228ed75d34480ee539f71b76a4fa89

so the correct solution to support USE=static-libs was always, rm the
file after the fact.

But now that it is correctly supported in live we can go back to the
original intention.

Bug: https://bugs.gentoo.org/907940
Bug: https://bugs.gentoo.org/909366
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sys-apps/dtc/dtc-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 3f84b5746faf..0d0226033d67 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -57,6 +57,7 @@ pkg_setup() {
 
 src_configure() {
        local emesonargs=(
+               -Ddefault_library=$(usex static-libs both shared)
                -Dtools=true
                -Dvalgrind=disabled # only used for some tests
                $(meson_feature python)
@@ -64,9 +65,6 @@ src_configure() {
                $(meson_feature yaml)
        )
 
-       # bug #909366
-       use static-libs && emesonargs+=( -Dstatic-build=true )
-
        meson_src_configure
 }
 

Reply via email to