diff options
| -rw-r--r-- | package/libcgicc/cgicc-3.2.7-sort-undeclared.patch | 38 | ||||
| -rw-r--r-- | package/libcgicc/libcgicc.mk | 1 |
2 files changed, 1 insertions, 38 deletions
diff --git a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch b/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch deleted file mode 100644 index c6e04ba8f..000000000 --- a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch +++ /dev/null @@ -1,38 +0,0 @@ -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=\"\">"; diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 7a94f0384..83898e93e 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -32,6 +32,7 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --disable-demos \ ) touch $@ |