public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/m17n-db/
Date: Sat, 22 Jun 2024 10:04:03 +0000 (UTC)	[thread overview]
Message-ID: <1719050537.3345a7412e25a871621c4abe77ae7d21552a1273.hattya@gentoo> (raw)

commit:     3345a7412e25a871621c4abe77ae7d21552a1273
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 09:29:37 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 10:02:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3345a741

dev-db/m17n-db: fix build on musl

Closes: https://bugs.gentoo.org/713438
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-db/m17n-db/Manifest             |  1 +
 dev-db/m17n-db/m17n-db-1.8.0.ebuild | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 257feef16d80..f1066e60beee 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1 +1,2 @@
+DIST glibc-2.39.tar.xz 18520988 BLAKE2B 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb SHA512 818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2
 DIST m17n-db-1.8.0.tar.gz 1977364 BLAKE2B 303afaf8eb105b8cc034be96efc7790f774870c5cbb688dc33da02847b545b42b20fc041c3842d9fbf9d17417472815e8185df37b58f4d2d72fac762a2669272 SHA512 b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5

diff --git a/dev-db/m17n-db/m17n-db-1.8.0.ebuild b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
index 7342e3737171..7563ae96f68a 100644
--- a/dev-db/m17n-db/m17n-db-1.8.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
@@ -3,9 +3,13 @@
 
 EAPI="8"
 
+GLIBC_PV="2.39"
+GLIBC_P="glibc-${GLIBC_PV}"
+
 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-db.git"
-SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz
+	elibc_musl? ( mirror://gnu/glibc/${GLIBC_P}.tar.xz )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -15,6 +19,20 @@ IUSE=""
 RDEPEND="virtual/libintl"
 BDEPEND="sys-devel/gettext"
 
+CHARMAPS="${GLIBC_P}/localedata/charmaps"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use elibc_musl; then
+		tar xf "${DISTDIR}"/${GLIBC_P}.tar.xz ${CHARMAPS} || die
+	fi
+}
+
+src_configure() {
+	econf $(usex elibc_musl "--with-charmaps=${WORKDIR}/${CHARMAPS}" "")
+}
+
 src_install() {
 	default
 


             reply	other threads:[~2024-06-22 10:04 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-22 10:04 Akinori Hattori [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-15  6:51 [gentoo-commits] repo/gentoo:master commit in: dev-db/m17n-db/ Akinori Hattori
2024-09-12 13:45 Sam James
2024-09-12  5:38 Jakov Smolić
2024-09-07  9:15 Sam James
2024-09-07  9:15 Sam James
2024-09-07  9:15 Sam James
2024-09-07  9:15 Sam James
2024-09-07  8:17 Sam James
2024-06-27 12:34 Akinori Hattori
2024-06-27 12:34 Akinori Hattori
2024-06-27 12:34 Akinori Hattori
2024-01-17 16:50 WANG Xuerui
2022-10-29 21:32 Sam James
2021-11-30 13:06 Akinori Hattori
2021-11-29  8:14 Arthur Zamarin
2021-11-28 23:36 Jakov Smolić
2021-11-28 19:28 Arthur Zamarin
2021-11-28 19:28 Arthur Zamarin
2021-11-28 19:28 Arthur Zamarin
2021-11-28  8:03 Arthur Zamarin
2021-11-28  7:38 Arthur Zamarin
2021-11-27  6:09 Akinori Hattori
2021-08-23 11:41 Marek Szuba
2019-07-26 13:18 Aaron Bauman
2018-08-28 13:52 Akinori Hattori
2018-08-28 13:52 Akinori Hattori
2018-04-16 18:29 Mike Gilbert
2018-03-21  5:55 Markus Meier
2017-11-17 11:18 Tobias Klausmann
2017-11-16 19:43 Sergei Trofimovich
2017-11-11 12:34 Sergei Trofimovich
2017-11-10 10:23 Sergei Trofimovich
2017-11-02 20:19 Sergei Trofimovich
2017-11-01 20:54 Mike Gilbert
2017-11-01 20:54 Mike Gilbert
2017-07-08  6:14 Akinori Hattori
2017-07-05 12:47 Akinori Hattori
2017-07-05 11:54 Akinori Hattori
2017-07-05 11:54 Akinori Hattori
2017-06-18 11:56 Alexis Ballier

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=1719050537.3345a7412e25a871621c4abe77ae7d21552a1273.hattya@gentoo \
    --to=hattya@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