OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Oct-2006 10:42:33
Branch: HEAD Handle: 2006100909423200
Modified files:
openpkg-src/ragel ragel.patch ragel.spec
Log:
fix building under Solaris where system headers contain a define for
'CS'
Summary:
Revision Changes Path
1.11 +26 -12 openpkg-src/ragel/ragel.patch
1.58 +1 -1 openpkg-src/ragel/ragel.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ragel/ragel.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 ragel.patch
--- openpkg-src/ragel/ragel.patch 9 Aug 2006 07:19:56 -0000 1.10
+++ openpkg-src/ragel/ragel.patch 9 Oct 2006 08:42:32 -0000 1.11
@@ -1,29 +1,43 @@
Index: rlcodegen/fsmcodegen.cpp
---- rlcodegen/fsmcodegen.cpp.orig 2006-03-07 20:02:30 +0100
-+++ rlcodegen/fsmcodegen.cpp 2006-03-13 07:53:38 +0100
+--- rlcodegen/fsmcodegen.cpp.orig 2006-09-22 23:54:58.000000000 +0200
++++ rlcodegen/fsmcodegen.cpp 2006-10-09 10:35:19.235000663 +0200
@@ -25,6 +25,7 @@
#include "fsmcodegen.h"
#include "redfsm.h"
#include "gendata.h"
+#include <climits>
#include <sstream>
+ #include <string>
+ #include <assert.h>
+Index: rlcodegen/fsmcodegen.h
+--- rlcodegen/fsmcodegen.h.orig 2006-09-22 23:54:58.000000000 +0200
++++ rlcodegen/fsmcodegen.h 2006-10-09 10:36:41.181483507 +0200
+@@ -29,6 +29,10 @@
+ #include <stdio.h>
+ #include "common.h"
+
++#ifdef CS
++#undef CS
++#endif
++
+ using std::string;
+ using std::ostream;
- /* Determine if a string is only whitespace. Code blocks that are only
Index: rlcodegen/gendata.cpp
---- rlcodegen/gendata.cpp.orig 2006-03-07 20:02:30 +0100
-+++ rlcodegen/gendata.cpp 2006-03-13 07:53:38 +0100
-@@ -31,6 +31,7 @@
- #include "fgotocodegen.h"
- #include "ipgotocodegen.h"
+--- rlcodegen/gendata.cpp.orig 2006-09-22 23:54:58.000000000 +0200
++++ rlcodegen/gendata.cpp 2006-10-09 10:35:19.235433522 +0200
+@@ -33,6 +33,7 @@
+ #include "splitcodegen.h"
+ #include "javacodegen.h"
+#include <climits>
#include <iostream>
using std::cerr;
Index: rlcodegen/xmlparse.y
---- rlcodegen/xmlparse.y.orig Sun Jul 30 22:41:37 2006
-+++ rlcodegen/xmlparse.y Wed Aug 9 01:05:51 2006
-@@ -474,7 +474,7 @@
+--- rlcodegen/xmlparse.y.orig 2006-09-22 23:54:58.000000000 +0200
++++ rlcodegen/xmlparse.y 2006-10-09 10:35:19.235811349 +0200
+@@ -493,7 +493,7 @@
cgd->initStateCondList( curState, length );
curStateCond = 0;
}
@@ -32,7 +46,7 @@
StateCondList:
StateCondList StateCond |
-@@ -488,7 +488,7 @@
+@@ -507,7 +507,7 @@
Key highKey = readKey( td, &td );
long condId = readOffsetPtr( td, &td );
cgd->addStateCond( curState, lowKey, highKey, condId );
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ragel/ragel.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 ragel.spec
--- openpkg-src/ragel/ragel.spec 2 Oct 2006 10:13:29 -0000 1.57
+++ openpkg-src/ragel/ragel.spec 9 Oct 2006 08:42:32 -0000 1.58
@@ -33,7 +33,7 @@
Group: CompilerCompiler
License: GPL
Version: 5.14
-Release: 20061002
+Release: 20061009
# list of sources
Source0:
http://www.cs.queensu.ca/home/thurston/ragel/ragel-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
