Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0f7c0f3e00c0335ff11d50cfe4105ad411e55086)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0f7c0f3e00c0335ff11d50cfe4105ad411e55086)
  • Date: Mon, 23 May 2016 09:51:32 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

devel/ragel/HISTORY | 3 ++
devel/ragel/PRE_BUILD | 3 ++
devel/ragel/ragel-6.9-gcc6.patch | 40
+++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)

New commits:
commit 0f7c0f3e00c0335ff11d50cfe4105ad411e55086
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ragel: patched to build with gcc6

diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index c13c730..437aca5 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,6 @@
+2016-05-23 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, ragel-6.9-gcc6.patch: patch to build with gcc6
+
2015-01-04 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 6.9

diff --git a/devel/ragel/PRE_BUILD b/devel/ragel/PRE_BUILD
new file mode 100755
index 0000000..fc6551f
--- /dev/null
+++ b/devel/ragel/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY/ragel-6.9-gcc6.patch"
diff --git a/devel/ragel/ragel-6.9-gcc6.patch
b/devel/ragel/ragel-6.9-gcc6.patch
new file mode 100644
index 0000000..cc28810
--- /dev/null
+++ b/devel/ragel/ragel-6.9-gcc6.patch
@@ -0,0 +1,40 @@
+--- ragel-6.9/ragel/common.cpp 2014-10-13 14:00:59.000000000 -0400
++++ ragel-6.9/ragel/common.cpp 2016-05-09 16:46:17.706100194 -0400
+@@ -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[] =
+--- ragel-6.9/ragel/rbxgoto.cpp 2014-10-13 14:00:59.000000000 -0400
++++ ragel-6.9/ragel/rbxgoto.cpp 2016-05-09 17:29:07.925220151 -0400
+@@ -658,7 +658,7 @@
+ out <<
+ " begin\n"
+ " " << P() << " += 1\n"
+- " " << rbxGoto(ret, "_out") << "\n"
++ " " << (const string&)rbxGoto(ret, "_out") <<
"\n"
+ " end\n";
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0f7c0f3e00c0335ff11d50cfe4105ad411e55086), Remko van der Vossen, 05/23/2016

Archive powered by MHonArc 2.6.24.

Top of Page