Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (74d335990c0e6ea70612fc71b2cdcc2d23de639f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (74d335990c0e6ea70612fc71b2cdcc2d23de639f)
  • Date: Tue, 12 Jun 2012 11:35:08 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

devel/ragel/HISTORY | 5 +
devel/ragel/PRE_BUILD | 4 +
devel/ragel/gcc-4.7.patch | 125
++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+)

New commits:
commit 74d335990c0e6ea70612fc71b2cdcc2d23de639f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ragel: apply fix for gcc 4.7
still compiles with gcc 4.6

diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index 82dde7d..21219b3 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,8 @@
+2012-06-12 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * gcc-4.7.patch: added, fix to compile with gcc 4.7
+ from debian
+
2011-12-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 6.7

diff --git a/devel/ragel/PRE_BUILD b/devel/ragel/PRE_BUILD
new file mode 100755
index 0000000..9327cb8
--- /dev/null
+++ b/devel/ragel/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc-4.7.patch
diff --git a/devel/ragel/gcc-4.7.patch b/devel/ragel/gcc-4.7.patch
new file mode 100644
index 0000000..caa0c67
--- /dev/null
+++ b/devel/ragel/gcc-4.7.patch
@@ -0,0 +1,125 @@
+--- ragel-6.7.orig/aapl/mergesort.h
++++ ragel-6.7/aapl/mergesort.h
+@@ -110,7 +110,7 @@
+ }
+ else {
+ /* Both upper and lower left. */
+- if ( compare(*lower, *upper) <= 0 )
++ if ( this->compare(*lower, *upper) <= 0 )
+ memcpy( dest++, lower++, sizeof(T) );
+ else
+ memcpy( dest++, upper++, sizeof(T) );
+--- ragel-6.7.orig/aapl/avlcommon.h
++++ ragel-6.7/aapl/avlcommon.h
+@@ -881,9 +881,9 @@
+ }
+
+ #ifdef AVL_BASIC
+- keyRelation = compare( *element, *curEl );
++ keyRelation = this->compare( *element, *curEl );
+ #else
+- keyRelation = compare( element->BASEKEY(getKey()),
++ keyRelation = this->compare( element->BASEKEY(getKey()),
+ curEl->BASEKEY(getKey()) );
+ #endif
+
+@@ -920,7 +920,7 @@
+ long keyRelation;
+
+ while (curEl) {
+- keyRelation = compare( *element, *curEl );
++ keyRelation = this->compare( *element, *curEl );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@
+ return element;
+ }
+
+- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@
+ return element;
+ }
+
+- keyRelation = compare(key, curEl->getKey());
++ keyRelation = this->compare(key, curEl->getKey());
+
+ /* Do we go left? */
+ if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@
+ long keyRelation;
+
+ while (curEl) {
+- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 )
+--- ragel-6.7.orig/aapl/bubblesort.h
++++ ragel-6.7/aapl/bubblesort.h
+@@ -72,7 +72,7 @@
+ changed = false;
+ for ( long i = 0; i < len-pass; i++ ) {
+ /* Do we swap pos with the next one? */
+- if ( compare( data[i], data[i+1] ) > 0 ) {
++ if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ char tmp[sizeof(T)];
+
+ /* Swap the two items. */
+--- ragel-6.7.orig/aapl/bstcommon.h
++++ ragel-6.7/aapl/bstcommon.h
+@@ -361,7 +361,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -373,12 +373,12 @@
+
+ lower = mid - 1;
+ while ( lower != lowEnd &&
+- compare(key, GET_KEY(*lower)) == 0 )
++ this->compare(key, GET_KEY(*lower))
== 0 )
+ lower--;
+
+ upper = mid + 1;
+ while ( upper != highEnd &&
+- compare(key, GET_KEY(*upper)) == 0 )
++ this->compare(key, GET_KEY(*upper))
== 0 )
+ upper++;
+
+ low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -457,7 +457,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -662,7 +662,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (74d335990c0e6ea70612fc71b2cdcc2d23de639f), Sukneet Basuta, 06/12/2012

Archive powered by MHonArc 2.6.24.

Top of Page