浏览代码

include string.h when building cgicc, add libcgicc-unpacked, and clean up libcgicc.mk - still does not build OK

Ulf Samuelsson 16 年之前
父节点
当前提交
02407b4c05
共有 2 个文件被更改,包括 18 次插入3 次删除
  1. 12 0
      package/libcgicc/cgicc-3.2.7-memset.patch
  2. 6 3
      package/libcgicc/libcgicc.mk

+ 12 - 0
package/libcgicc/cgicc-3.2.7-memset.patch

@@ -0,0 +1,12 @@
+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"
+

+ 6 - 3
package/libcgicc/libcgicc.mk

@@ -17,7 +17,8 @@ libcgicc-source: $(DL_DIR)/$(LIBCGICC_SOURCE)
 
 $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE)
 	$(LIBCGICC_CAT) $(DL_DIR)/$(LIBCGICC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(LIBCGICC_DIR)/.unpacked
+	toolchain/patch-kernel.sh $(LIBCGICC_DIR) package/libcgicc cgicc\*.patch
+	touch $@
 
 $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 	(cd $(LIBCGICC_DIR); rm -f config.cache; \
@@ -40,11 +41,11 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 	)
-	touch $(LIBCGICC_DIR)/.configured
+	touch $@
 
 $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
 	$(MAKE) -C $(LIBCGICC_DIR)
-	touch $(LIBCGICC_DIR)/.compiled
+	touch $@
 
 $(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
@@ -55,6 +56,8 @@ $(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so
 
 libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so
 
+libcgicc-unpacked: $(LIBCGICC_DIR)/.unpacked
+
 libcgicc-clean:
 		-$(MAKE) -C $(LIBCGICC_DIR) clean