public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dave Hughes" <davidhughes205@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/glib/
Date: Thu, 29 Apr 2021 18:05:10 +0000 (UTC)	[thread overview]
Message-ID: <1619719470.b667b4970867902298ba37012b3dd2e8b1e9a0ec.xaero@gentoo> (raw)

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


             reply	other threads:[~2021-04-29 18:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-29 18:05 Dave Hughes [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-29 18:08 [gentoo-commits] proj/musl:master commit in: dev-libs/glib/ Dave Hughes
2020-09-21 22:34 Jory Pratt
2020-08-18  1:01 Jory Pratt
2020-06-29  1:00 Jory Pratt
2019-10-20 22:14 Jory Pratt
2019-08-21 12:55 Anthony G. Basile
2019-02-11 11:43 Anthony G. Basile
2019-02-11 11:43 Anthony G. Basile
2019-01-26 22:44 Anthony G. Basile
2019-01-02 18:56 Anthony G. Basile
2018-01-25 20:03 Aric Belsito
2018-01-15 13:51 Anthony G. Basile
2016-11-09 19:16 Aric Belsito

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619719470.b667b4970867902298ba37012b3dd2e8b1e9a0ec.xaero@gentoo \
    --to=davidhughes205@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox