Gentoo Archives: gentoo-commits

From: Sam James <sam@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, 28 May 2021 01:41:08
Message-Id: 1622166055.ea51e2e8a9c0270df46484e214f0e9e6e86a45f2.sam@gentoo
1 commit: ea51e2e8a9c0270df46484e214f0e9e6e86a45f2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 28 01:29:47 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 01:40:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea51e2e8
7
8 dev-util/colm: drop Julia check which causes sandbox failure
9
10 Closes: https://bugs.gentoo.org/776688
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-util/colm/colm-0.14.7.ebuild | 4 ++
14 .../colm/files/colm-0.14.7-drop-julia-check.patch | 45 ++++++++++++++++++++++
15 2 files changed, 49 insertions(+)
16
17 diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
18 index a22badfbe4d..b1ab5f7a252 100644
19 --- a/dev-util/colm/colm-0.14.7.ebuild
20 +++ b/dev-util/colm/colm-0.14.7.ebuild
21 @@ -23,6 +23,10 @@ BDEPEND="
22 # libfsm moved from ragel -> colm, bug #766108
23 RDEPEND="!<dev-util/ragel-7.0.3"
24
25 +PATCHES=(
26 + "${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
27 +)
28 +
29 src_prepare() {
30 default
31
32
33 diff --git a/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch b/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch
34 new file mode 100644
35 index 00000000000..fc027927d29
36 --- /dev/null
37 +++ b/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch
38 @@ -0,0 +1,45 @@
39 +--- a/configure.ac
40 ++++ b/configure.ac
41 +@@ -284,41 +284,7 @@ AC_PATH_PROG([OCAML_BIN], [ocaml])
42 + AC_PATH_PROG([RUST_BIN], [rustc])
43 + AC_PATH_PROG([JULIA_BIN], [julia])
44 +
45 +-dnl
46 +-dnl Julia requires a large virtual address space. On systems where this is
47 +-dnl limited by ulimit, julia will fail to run.
48 +-dnl
49 +-
50 +-if test "x$JULIA_BIN" != x; then
51 +- echo 'println( "can run julia programs" );' > conftest.jl
52 +- AC_MSG_CHECKING([checking if julia is able to run programs ... ])
53 +- if sh -c "$JULIA_BIN conftest.jl" >>config.log 2>&1; then
54 +- AC_MSG_RESULT([yes])
55 +- else
56 +- AC_MSG_RESULT([no])
57 +- JULIA_BIN=""
58 +- fi
59 +- rm -f conftest.jl
60 +-fi
61 +-
62 +-dnl We can run julia, now make sure we have 1.0
63 +-if test "x$JULIA_BIN" != x; then
64 +- AC_MSG_CHECKING([checking if julia is version 1.0 or later ... ])
65 +-
66 +- dnl We assume the form "julia version X.X.X"
67 +- dnl 1. everything before the version number.
68 +- dnl 2. Remove trailing version.
69 +- dnl 3. Verify it is plain number greater than 1.
70 +- dnl Any failure comes out as empty string. Note the sed command is wrapped
71 +- dnl in [] so autotools do not interpret anything in it.
72 +- JULIA1="`$JULIA_BIN -v | sed ['s/[A-Za-z ]\+//g; s/\.[0-9\.]*//; /^[1-9][0-9]*/!d;']`"
73 +- if test "x$JULIA1" != x; then
74 +- AC_MSG_RESULT([yes])
75 +- else
76 +- AC_MSG_RESULT([no])
77 +- JULIA_BIN=""
78 +- fi
79 +-fi
80 ++JULIA_BIN=""
81 +
82 + AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config])
83 +