aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-21 00:27:11 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-21 00:27:11 +0000
commit98186f1d474b5dcc2cd32d5b6d7194c2ec385b5d (patch)
tree75d64c08b1ad72df3e1762ef8653ce70d754c897
parent02407b4c05285a385cfe37b2de876878fbe7aa10 (diff)
downloadbuildroot-98186f1d474b5dcc2cd32d5b6d7194c2ec385b5d.tar.gz
buildroot-98186f1d474b5dcc2cd32d5b6d7194c2ec385b5d.tar.bz2
add patch form cgicc'upstream, build now completes\!
-rw-r--r--package/libcgicc/cgicc-3.2.7-sort-undeclared.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch b/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch
new file mode 100644
index 0000000000..c6e04ba8fb
--- /dev/null
+++ b/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch
@@ -0,0 +1,38 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [patch] sort is now in <algorithm>
+
+When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled any more; sort
+is now being part of <algorithm> and must be written as ::sort:
+
+cardgame.cpp:1232: error: 'sort' was not declared in this scope
+make[2]: *** [cardgame.o] Error 1
+
+Fix it.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ demo/cardgame.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: cgicc-3.2.7/demo/cardgame.cpp
+===================================================================
+--- cgicc-3.2.7.orig/demo/cardgame.cpp
++++ cgicc-3.2.7/demo/cardgame.cpp
+@@ -36,6 +36,7 @@
+ #include <sstream>
+ #include <fstream>
+ #include <queue>
++#include <algorithm>
+
+ #include "cgicc/CgiDefs.h"
+ #include "cgicc/Cgicc.h"
+@@ -1043,7 +1044,7 @@ namespace CardGameTools
+
+ void drawPlayerCards(datasplayer *vPlayer)
+ {
+- sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
++ std::sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
+ cout <<"<form name=\"cards\">";
+ cout <<"<input type=\"hidden\" name=\"actionner\" value=\"\">";
+ cout <<"<input type=\"hidden\" name=\"card\" value=\"\">";