gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/ragel: Fix building with GCC-6

Browse Source 
Closes: https://bugs.gentoo.org/582606
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6043
This commit is contained in:
Peter Levine
2017-10-25 01:10:47 -04:00
committed by David Seifert
parent 0ed4f99c28
commit 659cb1b630
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dev-util/ragel/files/ragel-6.9-gcc6.patch Normal file
View File

@@ -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";
}

1
dev-util/ragel/ragel-6.9.ebuild
View File

@@ -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() {