public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-xmpp/
Date: Sun, 30 Aug 2020 01:05:11 +0000 (UTC)	[thread overview]
Message-ID: <1598749499.a1e1594330a3722fe4baa304dbd5baeb5fc693b9.sam@gentoo> (raw)

commit:     a1e1594330a3722fe4baa304dbd5baeb5fc693b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 00:57:27 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 01:04:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e15943

net-irc/irssi-xmpp: fix musl build, respect CC

Closes: https://bugs.gentoo.org/713638
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/irssi-xmpp/Manifest               |  1 +
 net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index 7fcd6b7a56c..8bdb1e6629e 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,2 +1,3 @@
 DIST irssi-xmpp-0.53.tar.gz 65649 BLAKE2B 69621ae0fadb3b3c1015b5ffa1f4b9e81cc3b92270c07582f5a4cefe83f9ed4e1735527900c6989127c8d70616b316ea42653ee57aa5a8b0e6e5c641cf064346 SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be
+DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14

diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
index 78831f46818..fab3d7c47f1 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
@@ -8,29 +8,33 @@ inherit toolchain-funcs
 DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
 HOMEPAGE="https://cybione.org/~irssi-xmpp/"
 SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	net-irc/irssi
 	net-libs/loudmouth
 "
-
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
+
+	eapply "${DISTDIR}/${PN}-0.54-musl-build.patch"
+
 	sed -e "s/{MAKE} doc-install/{MAKE}/" \
 		-i Makefile || die #322355
 }
 
 src_compile() {
-	emake PREFIX=/usr
+	emake PREFIX=/usr CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
+	emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
 	dodoc README.md NEWS TODO docs/*
 }


             reply	other threads:[~2020-08-30  1:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-30  1:05 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-15  9:51 [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-xmpp/ Petr Vaněk
2022-06-24 13:09 Andrew Ammerlaan
2022-06-24 13:09 Andrew Ammerlaan
2022-06-12 10:36 Sam James
2020-04-28  7:44 Joonas Niilola
2017-10-19 17:45 Michał Górny
2017-03-18  9:45 Michael Palimaka
2017-03-18  9:42 Michael Palimaka
2016-05-31 14:30 Patrice Clement
2016-05-25  8:19 Patrice Clement

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=1598749499.a1e1594330a3722fe4baa304dbd5baeb5fc693b9.sam@gentoo \
    --to=sam@gentoo.org \
    --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