This means that USE=static-libs doesn't produce a "broken" library
when built w/ LTO.

Bug: https://bugs.gentoo.org/927994
Signed-off-by: Sam James <[email protected]>
---
 dev-libs/glib/glib-2.78.6.ebuild    | 7 +++++++
 dev-libs/glib/glib-2.80.5-r1.ebuild | 7 +++++++
 dev-libs/glib/glib-2.82.5.ebuild    | 7 +++++++
 dev-libs/glib/glib-2.84.0.ebuild    | 7 +++++++
 dev-libs/glib/glib-2.84.1.ebuild    | 9 ++++++++-
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild
index e5481fe4d0052..b9609c7c059f2 100644
--- a/dev-libs/glib/glib-2.78.6.ebuild
+++ b/dev-libs/glib/glib-2.78.6.ebuild
@@ -173,6 +173,11 @@ src_prepare() {
        # TODO: python_name sedding for correct python shebang? Might be 
relevant mainly for glib-utils only
 }
 
+src_configure() {
+       lto-guarantee-fat
+       meson-multilib_src_configure
+}
+
 multilib_src_configure() {
        # TODO: figure a way to pass appropriate values for all cross properties
        # that glib uses (search for get_cross_property)
@@ -245,6 +250,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        # These are installed by dev-util/glib-utils
        # TODO: With patching we might be able to get rid of the python-any deps
        # and removals, and test depend on glib-utils instead; revisit now with
diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild 
b/dev-libs/glib/glib-2.80.5-r1.ebuild
index fb26093bb4256..d1794a03ff0c3 100644
--- a/dev-libs/glib/glib-2.80.5-r1.ebuild
+++ b/dev-libs/glib/glib-2.80.5-r1.ebuild
@@ -210,6 +210,11 @@ src_prepare() {
        # TODO: python_name sedding for correct python shebang? Might be 
relevant mainly for glib-utils only
 }
 
+src_configure() {
+       lto-guarantee-fat
+       meson-multilib_src_configure
+}
+
 multilib_src_configure() {
        # TODO: figure a way to pass appropriate values for all cross properties
        # that glib uses (search for get_cross_property)
@@ -371,6 +376,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        # These are installed by dev-util/glib-utils
        # TODO: With patching we might be able to get rid of the python-any deps
        # and removals, and test depend on glib-utils instead; revisit now with
diff --git a/dev-libs/glib/glib-2.82.5.ebuild b/dev-libs/glib/glib-2.82.5.ebuild
index b16e62189f6ac..859f0f25c4897 100644
--- a/dev-libs/glib/glib-2.82.5.ebuild
+++ b/dev-libs/glib/glib-2.82.5.ebuild
@@ -198,6 +198,11 @@ src_prepare() {
        # TODO: python_name sedding for correct python shebang? Might be 
relevant mainly for glib-utils only
 }
 
+src_configure() {
+       lto-guarantee-fat
+       meson-multilib_src_configure
+}
+
 multilib_src_configure() {
        # TODO: figure a way to pass appropriate values for all cross properties
        # that glib uses (search for get_cross_property)
@@ -359,6 +364,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        # These are installed by dev-util/glib-utils
        # TODO: With patching we might be able to get rid of the python-any deps
        # and removals, and test depend on glib-utils instead; revisit now with
diff --git a/dev-libs/glib/glib-2.84.0.ebuild b/dev-libs/glib/glib-2.84.0.ebuild
index 8ec0a9d7d48d3..50dfe9b47f1c1 100644
--- a/dev-libs/glib/glib-2.84.0.ebuild
+++ b/dev-libs/glib/glib-2.84.0.ebuild
@@ -202,6 +202,11 @@ src_prepare() {
        # TODO: python_name sedding for correct python shebang? Might be 
relevant mainly for glib-utils only
 }
 
+src_configure() {
+       lto-guarantee-fat
+       meson-multilib_src_configure
+}
+
 multilib_src_configure() {
        # TODO: figure a way to pass appropriate values for all cross properties
        # that glib uses (search for get_cross_property)
@@ -363,6 +368,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        # These are installed by dev-util/glib-utils
        # TODO: With patching we might be able to get rid of the python-any deps
        # and removals, and test depend on glib-utils instead; revisit now with
diff --git a/dev-libs/glib/glib-2.84.1.ebuild b/dev-libs/glib/glib-2.84.1.ebuild
index e5e5ff280c0f2..342d919ebecd7 100644
--- a/dev-libs/glib/glib-2.84.1.ebuild
+++ b/dev-libs/glib/glib-2.84.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib 
python-any-r1 toolchain-funcs xdg
+inherit dot-a eapi9-ver gnome.org gnome2-utils linux-info meson-multilib 
multilib python-any-r1 toolchain-funcs xdg
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/";
@@ -203,6 +203,11 @@ src_prepare() {
        # TODO: python_name sedding for correct python shebang? Might be 
relevant mainly for glib-utils only
 }
 
+src_configure() {
+       lto-guarantee-fat
+       meson-multilib_src_configure
+}
+
 multilib_src_configure() {
        # TODO: figure a way to pass appropriate values for all cross properties
        # that glib uses (search for get_cross_property)
@@ -364,6 +369,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        # These are installed by dev-util/glib-utils
        # TODO: With patching we might be able to get rid of the python-any deps
        # and removals, and test depend on glib-utils instead; revisit now with
-- 
2.49.0


Reply via email to