Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gr/, sci-visualization/gr/files/
Date: Sat, 26 Feb 2022 18:41:55
Message-Id: 1645900871.bc5b49f1264f425fa395372c0383ae753a9399a1.dilfridge@gentoo
1 commit: bc5b49f1264f425fa395372c0383ae753a9399a1
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 26 18:41:11 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 26 18:41:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5b49f1
7
8 sci-visualization/gr: Fix build with musl
9
10 Closes: https://bugs.gentoo.org/832836
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
13
14 sci-visualization/gr/files/gr-0.53.0-musl.patch | 29 +++++++++++++++++++++++++
15 sci-visualization/gr/gr-0.53.0.ebuild | 6 ++++-
16 2 files changed, 34 insertions(+), 1 deletion(-)
17
18 diff --git a/sci-visualization/gr/files/gr-0.53.0-musl.patch b/sci-visualization/gr/files/gr-0.53.0-musl.patch
19 new file mode 100644
20 index 000000000000..c5f0519341f6
21 --- /dev/null
22 +++ b/sci-visualization/gr/files/gr-0.53.0-musl.patch
23 @@ -0,0 +1,29 @@
24 +From 205a70fdbd69d7877994e7aea5cec6eab79236b2 Mon Sep 17 00:00:00 2001
25 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o>
26 +Date: Sat, 26 Feb 2022 19:38:20 +0100
27 +Subject: [PATCH] Fix build with musl libc
28 +MIME-Version: 1.0
29 +Content-Type: text/plain; charset=UTF-8
30 +Content-Transfer-Encoding: 8bit
31 +
32 +Signed-off-by: Andreas K. Hüttel <dilfridge@g.o>
33 +---
34 + lib/gks/io.c | 2 +-
35 + 1 file changed, 1 insertion(+), 1 deletion(-)
36 +
37 +diff --git a/lib/gks/io.c b/lib/gks/io.c
38 +index 669dd81f..50fde2c4 100644
39 +--- a/lib/gks/io.c
40 ++++ b/lib/gks/io.c
41 +@@ -11,7 +11,7 @@
42 + #include <io.h>
43 + #endif
44 +
45 +-#if defined(cray) || defined(__SVR4) || defined(_WIN32)
46 ++#if defined(cray) || defined(__SVR4) || defined(_WIN32) || defined(__MUSL__)
47 + #include <fcntl.h>
48 + #else
49 + #include <sys/file.h>
50 +--
51 +2.34.1
52 +
53
54 diff --git a/sci-visualization/gr/gr-0.53.0.ebuild b/sci-visualization/gr/gr-0.53.0.ebuild
55 index dbdaaca1611b..c46b776f0a07 100644
56 --- a/sci-visualization/gr/gr-0.53.0.ebuild
57 +++ b/sci-visualization/gr/gr-0.53.0.ebuild
58 @@ -1,4 +1,4 @@
59 -# Copyright 2019-2021 Gentoo Authors
60 +# Copyright 2019-2022 Gentoo Authors
61 # Distributed under the terms of the GNU General Public License v2
62
63 EAPI=7
64 @@ -34,6 +34,10 @@ DEPEND="
65 RDEPEND="${DEPEND}"
66 BDEPEND=""
67
68 +PATCHES=(
69 + "${FILESDIR}/${P}-musl.patch"
70 +)
71 +
72 src_configure() {
73 use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
74 use postscript || mycmakeargs+=( -DGS_LIBRARY= )