commit: b667b4970867902298ba37012b3dd2e8b1e9a0ec
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 18:04:30 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 29 18:04:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b667b497
dev-libs/glib: move musl patch behind elibc_musl
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
dev-libs/glib/glib-2.66.7.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
index 20a8f7f..2aa6ab7 100644
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -72,7 +72,6 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
- "${FILESDIR}"/0001-gquark-fix-initialization-with-c-constructors.patch
)
pkg_setup() {
@@ -88,6 +87,11 @@ pkg_setup() {
}
src_prepare() {
+
+ if use elibc_musl ; then
+ eapply
"${FILESDIR}"/0001-gquark-fix-initialization-with-c-constructors.patch
+ fi
+
if use test; then
# TODO: Review the test exclusions, especially now with meson
# Disable tests requiring dev-util/desktop-file-utils when not
installed, bug #286629, upstream bug #629163