libcgicc: don't build demos

And remove unneeded patch for demos while we're at it.

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 (file)
index c6e04ba..0000000
--- 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 7a94f03847a00afc21526e15df19ac0030af5340..83898e93eabefbbbb13b20204d3e6827396aef5b 100644 (file)
--- 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 $@