diff options
| -rw-r--r-- | package/libcgicc/cgicc-3.2.7-memset.patch | 12 | ||||
| -rw-r--r-- | package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch | 50 | ||||
| -rw-r--r-- | package/libcgicc/libcgicc.mk | 8 |
3 files changed, 55 insertions, 15 deletions
diff --git a/package/libcgicc/cgicc-3.2.7-memset.patch b/package/libcgicc/cgicc-3.2.7-memset.patch deleted file mode 100644 index f1c1411e9..000000000 --- a/package/libcgicc/cgicc-3.2.7-memset.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cgicc-3.2.7-0rig//demo/dns.cpp cgicc-3.2.7/demo/dns.cpp ---- cgicc-3.2.7-0rig//demo/dns.cpp 2009-01-21 00:24:13.000000000 +0100 -+++ cgicc-3.2.7/demo/dns.cpp 2009-01-21 00:24:30.000000000 +0100 -@@ -34,6 +34,7 @@ - #include <vector> - #include <stdexcept> - #include <iostream> -+#include <string.h> - - #include "cgicc/CgiDefs.h" - #include "cgicc/Cgicc.h" - diff --git a/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch b/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch new file mode 100644 index 000000000..a7b04a83a --- /dev/null +++ b/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch @@ -0,0 +1,50 @@ +Index: cgicc-3.2.9/Makefile.am +=================================================================== +--- cgicc-3.2.9.orig/Makefile.am 2010-02-25 16:34:06.000000000 +0100 ++++ cgicc-3.2.9/Makefile.am 2010-02-25 16:34:14.000000000 +0100 +@@ -8,9 +8,15 @@ + DEMO = + endif + ++if DOC ++DOCDIR = doc ++else ++DOC = ++endif ++ + ACLOCAL_AMFLAGS= + +-SUBDIRS = cgicc doc support $(DEMO) ++SUBDIRS = cgicc $(DOCDIR) support $(DEMO) + + CLEANFILES = *~ + +Index: cgicc-3.2.9/configure.ac +=================================================================== +--- cgicc-3.2.9.orig/configure.ac 2010-02-25 16:34:06.000000000 +0100 ++++ cgicc-3.2.9/configure.ac 2010-02-25 16:45:46.000000000 +0100 +@@ -17,9 +17,23 @@ + AC_PROG_CXX + AC_PROG_INSTALL + AC_PROG_LIBTOOL +-AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) + + ++AC_ARG_ENABLE(doc, ++ [ --enable-doc build doc [[default=yes]]], ++ [case "${enableval}" in ++ yes) cgicc_doc=yes ;; ++ no) cgicc_doc=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-doc) ;; ++ esac], cgicc_doc=yes) ++ ++if test "$cgicc_doc" = yes; then ++ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) ++ if test -z "$DOXYGEN" ; then ++ AC_MSG_ERROR([Doxygen is required to build the documentation]) ++ fi ++fi ++AM_CONDITIONAL(DOC, test "$cgicc_doc" = yes) + + dnl Determine host system type + diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 5237e70fd..b4cf56734 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBCGICC_VERSION=3.2.7 +LIBCGICC_VERSION=3.2.9 LIBCGICC_DIR=$(BUILD_DIR)/cgicc-$(LIBCGICC_VERSION) LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz @@ -22,6 +22,7 @@ $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE) $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked (cd $(LIBCGICC_DIR); rm -f config.cache; \ + $(AUTORECONF); \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure $(QUIET) \ @@ -33,15 +34,16 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked --sysconfdir=/etc \ --localstatedir=/var \ --disable-demos \ + --disable-doc \ ) touch $@ $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured - $(MAKE) -C $(LIBCGICC_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(LIBCGICC_DIR) touch $@ $(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install touch -c $(STAGING_DIR)/usr/lib/libcgicc.so $(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so |