* [gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/, dev-util/ragel/files/
@ 2021-05-28 1:41 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-05-28 1:41 UTC (permalink / raw
To: gentoo-commits
commit: bd3624647bbe0e6366651230e1610bdac8f4eab3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:25:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 01:40:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd362464
dev-util/ragel: drop Julia check which causes sandbox failure
Closes: https://bugs.gentoo.org/776688
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ragel/files/ragel-7.0.4-drop-julia-check.patch | 45 ++++++++++++++++++++++
dev-util/ragel/ragel-7.0.4.ebuild | 4 ++
2 files changed, 49 insertions(+)
diff --git a/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch b/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch
new file mode 100644
index 00000000000..10ede37ae36
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch
@@ -0,0 +1,45 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,41 +305,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
+- echo -n "checking if julia is able to run programs ... "
+- if sh -c "$JULIA_BIN conftest.jl" >>config.log 2>&1; then
+- echo "yes"
+- else
+- echo "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
+- echo -n "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
+- echo "yes"
+- else
+- JULIA_BIN=""
+- echo "no"
+- fi
+-fi
++JULIA_BIN=""
+
+ AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config])
+
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index f9733495756..3611668b385 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -32,6 +32,10 @@ BDEPEND="
DEPEND="~dev-util/colm-0.14.7"
RDEPEND="${DEPEND}"
+PATCHES=(
+ #"${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/, dev-util/ragel/files/
@ 2017-11-18 18:10 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-11-18 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 659cb1b6308cd164dc73ef9b9da3087385690837
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Wed Oct 25 05:10:47 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 18:09:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659cb1b6
dev-util/ragel: Fix building with GCC-6
Closes: https://bugs.gentoo.org/582606
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6043
dev-util/ragel/files/ragel-6.9-gcc6.patch | 42 +++++++++++++++++++++++++++++++
dev-util/ragel/ragel-6.9.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/dev-util/ragel/files/ragel-6.9-gcc6.patch b/dev-util/ragel/files/ragel-6.9-gcc6.patch
new file mode 100644
index 00000000000..fb10d9fd2b7
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.9-gcc6.patch
@@ -0,0 +1,42 @@
+Bug: https://bugs.gentoo.org/582606
+
+--- a/ragel/common.cpp
++++ b/ragel/common.cpp
+@@ -34,7 +34,7 @@
+ { "int", 0, "int", true, true, false, INT_MIN, INT_MAX, sizeof(int) },
+ { "unsigned", "int", "uint", false, true, false, 0, UINT_MAX, sizeof(unsigned int) },
+ { "long", 0, "long", true, true, false, LONG_MIN, LONG_MAX, sizeof(long) },
+- { "unsigned", "long", "ulong", false, true, false, 0, ULONG_MAX, sizeof(unsigned long) }
++ { "unsigned", "long", "ulong", false, true, false, 0, (long long) ULONG_MAX, sizeof(unsigned long) }
+ };
+
+ #define S8BIT_MIN -128
+@@ -87,7 +87,7 @@
+ { "int32", 0, "int32", true, true, false, S32BIT_MIN, S32BIT_MAX, 4 },
+ { "uint32", 0, "uint32", false, true, false, U32BIT_MIN, U32BIT_MAX, 4 },
+ { "int64", 0, "int64", true, true, false, S64BIT_MIN, S64BIT_MAX, 8 },
+- { "uint64", 0, "uint64", false, true, false, U64BIT_MIN, U64BIT_MAX, 8 },
++ { "uint64", 0, "uint64", false, true, false, U64BIT_MIN, (long long) U64BIT_MAX, 8 },
+ { "rune", 0, "int32", true, true, true, S32BIT_MIN, S32BIT_MAX, 4 }
+ };
+
+@@ -116,7 +116,7 @@
+ { "int", 0, "int", true, true, false, INT_MIN, INT_MAX, 4 },
+ { "uint", 0, "uint", false, true, false, 0, UINT_MAX, 4 },
+ { "long", 0, "long", true, true, false, LONG_MIN, LONG_MAX, 8 },
+- { "ulong", 0, "ulong", false, true, false, 0, ULONG_MAX, 8 }
++ { "ulong", 0, "ulong", false, true, false, 0, (long long) ULONG_MAX, 8 }
+ };
+
+ HostType hostTypesOCaml[] =
+--- a/ragel/rbxgoto.cpp
++++ b/ragel/rbxgoto.cpp
+@@ -658,7 +658,7 @@
+ out <<
+ " begin\n"
+ " " << P() << " += 1\n"
+- " " << rbxGoto(ret, "_out") << "\n"
++ " " << static_cast<bool>(rbxGoto(ret, "_out")) << "\n"
+ " end\n";
+ }
+
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index bfa5a8aa194..9de48f66793 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -20,6 +20,7 @@ RDEPEND=""
# We need to get the txl language in Portage to have the tests :(
RESTRICT=test
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
DOCS=( ChangeLog CREDITS README TODO )
src_test() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-28 1:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-28 1:41 [gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/, dev-util/ragel/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-11-18 18:10 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox