Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/colm/, dev-util/colm/files/
Date: Fri, 14 Jan 2022 19:41:35
Message-Id: 1642189288.b5277dffbe654139fcec7f892786cfa145aa05f9.grobian@gentoo
1 commit: b5277dffbe654139fcec7f892786cfa145aa05f9
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 14 19:41:09 2022 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 14 19:41:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5277dff
7
8 dev-util/colm-0.14.7-r1: add patch for Solaris
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 dev-util/colm/colm-0.14.7-r1.ebuild | 3 ++-
14 dev-util/colm/files/colm-0.14.7-solaris.patch | 28 +++++++++++++++++++++++++++
15 2 files changed, 30 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
18 index 831d5bc521f1..1af0b8772742 100644
19 --- a/dev-util/colm/colm-0.14.7-r1.ebuild
20 +++ b/dev-util/colm/colm-0.14.7-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=8
27 @@ -26,6 +26,7 @@ RDEPEND="!<dev-util/ragel-7.0.3"
28 PATCHES=(
29 "${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
30 "${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
31 + "${FILESDIR}"/${PN}-0.14.7-solaris.patch
32 )
33
34 src_prepare() {
35
36 diff --git a/dev-util/colm/files/colm-0.14.7-solaris.patch b/dev-util/colm/files/colm-0.14.7-solaris.patch
37 new file mode 100644
38 index 000000000000..83b03b0d23a1
39 --- /dev/null
40 +++ b/dev-util/colm/files/colm-0.14.7-solaris.patch
41 @@ -0,0 +1,28 @@
42 +https://github.com/adrian-thurston/colm/pull/145
43 +
44 +commit 0a0fa0a41928564fa92100bff1bc21f85d770bfb
45 +Author: Fabian Groffen <grobian@g.o>
46 +Date: Wed Jan 12 20:32:44 2022 +0100
47 +
48 + src/bytecode.c: include config.h to activate guards
49 +
50 + Fix compilation on Solaris, which needs sys/wait.h for macros like
51 + WEXITSTATUS.
52 +
53 + Signed-off-by: Fabian Groffen <grobian@g.o>
54 +
55 +diff --git a/src/bytecode.c b/src/bytecode.c
56 +index 8ef848b0..c30778da 100644
57 +--- a/src/bytecode.c
58 ++++ b/src/bytecode.c
59 +@@ -20,6 +20,10 @@
60 + * SOFTWARE.
61 + */
62 +
63 ++#ifdef HAVE_CONFIG_H
64 ++# include "config.h"
65 ++#endif
66 ++
67 + #include <colm/bytecode.h>
68 +
69 + #include <sys/types.h>