commit: 7abf9be713ffbe610cb77648fb162501764785fc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 2 00:13:11 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 6 08:45:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abf9be7
dev-libs/glib: use dot-a.eclass for LTO 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 <sam <AT> gentoo.org> dev-libs/glib/glib-2.78.6.ebuild | 9 ++++++++- dev-libs/glib/glib-2.80.5-r1.ebuild | 9 ++++++++- dev-libs/glib/glib-2.82.5.ebuild | 9 ++++++++- dev-libs/glib/glib-2.84.0.ebuild | 9 ++++++++- dev-libs/glib/glib-2.84.1.ebuild | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild index e7fad17bc487..3b5d51599f53 100644 --- a/dev-libs/glib/glib-2.78.6.ebuild +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" PYTHON_COMPAT=( python3_{11..13} ) -inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit dot-a 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/"; @@ -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 246b5d60c869..29b3166bf27a 100644 --- a/dev-libs/glib/glib-2.80.5-r1.ebuild +++ b/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" PYTHON_COMPAT=( python3_{11..13} ) -inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit dot-a 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/"; @@ -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) @@ -388,6 +393,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 a134d8d35606..25e56d954a0a 100644 --- a/dev-libs/glib/glib-2.82.5.ebuild +++ b/dev-libs/glib/glib-2.82.5.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" PYTHON_COMPAT=( python3_{11..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/"; @@ -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) @@ -376,6 +381,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 0ec8e828545b..0324bbf012be 100644 --- a/dev-libs/glib/glib-2.84.0.ebuild +++ b/dev-libs/glib/glib-2.84.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" PYTHON_COMPAT=( python3_{11..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/"; @@ -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) @@ -380,6 +385,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 fb9437f28eef..5584e992e941 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_{11..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) @@ -381,6 +386,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
