[gentoo-commits] repo/gentoo:master commit in: dev-util/colm/, dev-util/colm/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/colm/, dev-util/colm/files/

[Sam James]

commit:     ea51e2e8a9c0270df46484e214f0e9e6e86a45f2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:29:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 01:40:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea51e2e8

dev-util/colm: drop Julia check which causes sandbox failure

Closes: https://bugs.gentoo.org/776688
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/colm/colm-0.14.7.ebuild                   |  4 ++
 .../colm/files/colm-0.14.7-drop-julia-check.patch  | 45 ++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index a22badfbe4d..b1ab5f7a252 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -23,6 +23,10 @@ BDEPEND="
 # libfsm moved from ragel -> colm, bug #766108
 RDEPEND="!<dev-util/ragel-7.0.3"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
+)
+
 src_prepare() {
 	default
 

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
new file mode 100644
index 00000000000..fc027927d29
--- /dev/null
+++ b/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch
@@ -0,0 +1,45 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,41 +284,7 @@ AC_PATH_PROG([OCAML_BIN], [ocaml])
+ AC_PATH_PROG([RUST_BIN], [rustc])
+ AC_PATH_PROG([JULIA_BIN], [julia])
+ 
+-dnl
+-dnl Julia requires a large virtual address space. On systems where this is
+-dnl limited by ulimit, julia will fail to run.
+-dnl
+-
+-if test "x$JULIA_BIN" != x; then
+-	echo 'println( "can run julia programs" );' > conftest.jl
+-	AC_MSG_CHECKING([checking if julia is able to run programs ... ])
+-	if sh -c "$JULIA_BIN conftest.jl" >>config.log 2>&1; then
+-		AC_MSG_RESULT([yes])
+-	else
+-		AC_MSG_RESULT([no])
+-		JULIA_BIN=""
+-	fi
+-	rm -f conftest.jl
+-fi
+-
+-dnl We can run julia, now make sure we have 1.0
+-if test "x$JULIA_BIN" != x; then
+-	AC_MSG_CHECKING([checking if julia is version 1.0 or later ... ])
+-
+-	dnl We assume the form "julia version X.X.X"
+-	dnl   1. everything before the version number.
+-	dnl   2. Remove trailing version.
+-	dnl   3. Verify it is plain number greater than 1.
+-	dnl Any failure comes out as empty string. Note the sed command is wrapped
+-	dnl in [] so autotools do not interpret anything in it.
+-	JULIA1="`$JULIA_BIN -v | sed ['s/[A-Za-z ]\+//g; s/\.[0-9\.]*//; /^[1-9][0-9]*/!d;']`"
+-	if test "x$JULIA1" != x; then
+-		AC_MSG_RESULT([yes]) 
+-	else
+-		AC_MSG_RESULT([no]) 
+-		JULIA_BIN=""
+-	fi
+-fi
++JULIA_BIN=""
+ 
+ AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config])
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/colm/, dev-util/colm/files/

[Fabian Groffen]

commit:     b5277dffbe654139fcec7f892786cfa145aa05f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 19:41:09 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 19:41:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5277dff

dev-util/colm-0.14.7-r1: add patch for Solaris

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-util/colm/colm-0.14.7-r1.ebuild           |  3 ++-
 dev-util/colm/files/colm-0.14.7-solaris.patch | 28 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index 831d5bc521f1..1af0b8772742 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ RDEPEND="!<dev-util/ragel-7.0.3"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
 	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
+	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
 )
 
 src_prepare() {

diff --git a/dev-util/colm/files/colm-0.14.7-solaris.patch b/dev-util/colm/files/colm-0.14.7-solaris.patch
new file mode 100644
index 000000000000..83b03b0d23a1
--- /dev/null
+++ b/dev-util/colm/files/colm-0.14.7-solaris.patch
@@ -0,0 +1,28 @@
+https://github.com/adrian-thurston/colm/pull/145
+
+commit 0a0fa0a41928564fa92100bff1bc21f85d770bfb
+Author: Fabian Groffen <grobian@gentoo.org>
+Date:   Wed Jan 12 20:32:44 2022 +0100
+
+    src/bytecode.c: include config.h to activate guards
+    
+    Fix compilation on Solaris, which needs sys/wait.h for macros like
+    WEXITSTATUS.
+    
+    Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+diff --git a/src/bytecode.c b/src/bytecode.c
+index 8ef848b0..c30778da 100644
+--- a/src/bytecode.c
++++ b/src/bytecode.c
+@@ -20,6 +20,10 @@
+  * SOFTWARE.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <colm/bytecode.h>
+ 
+ #include <sys/types.h>