summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-07-08 18:14:51 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-07-08 18:14:51 +0000
commit99b812f7780c1a81287e08c383a86c4ac643f153 (patch)
tree29788cd3295c8b9c88b38c9ed6863acb473507c0
parent7d8a59b40e46fa6ed84a5b78644327e97d04adef (diff)
downloadbuildroot-novena-99b812f7780c1a81287e08c383a86c4ac643f153.tar.gz
buildroot-novena-99b812f7780c1a81287e08c383a86c4ac643f153.zip
- bump version and make it compile
-rw-r--r--package/lighttpd/lighttpd.mk40
1 files changed, 27 insertions, 13 deletions
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 67f500677..5951bba2a 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -3,28 +3,40 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VER:=1.4.13
-LIGHTTPD_SOURCE:=lighttpd-$(LIGHTTPD_VER).tar.gz
-LIGHTTPD_SITE:=http://www.lighttpd.net/download
-LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VER)
+LIGHTTPD_VERSION:=1.4.15
+LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
+LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
+LIGHTTPD_SITE:=http://ftp.debian.org/debian/pool/main/l/lighttpd
+LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_CAT:=$(ZCAT)
LIGHTTPD_BINARY:=src/lighttpd
LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
+ifneq ($(BR2_LARGEFILE),y)
+LIGHTTPD_LFS:=--disable-lfs
+endif
+
$(DL_DIR)/$(LIGHTTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
+ifneq ($(LIGHTTPD_PATCH),)
+LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH)
+$(LIGHTTPD_PATCH_FILE):
+ $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
+endif
+lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE)
-lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE)
-
-#############################################################
-#
-# build lighttpd for use on the target system
-#
-#############################################################
$(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE)
$(LIGHTTPD_CAT) $(DL_DIR)/$(LIGHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIGHTTPD_DIR) package/lighttpd/ lighttpd\*.patch
- touch $(LIGHTTPD_DIR)/.unpacked
+ifneq ($(LIGHTTPD_PATCH),)
+ (cd $(LIGHTTPD_DIR)&&$(LIGHTTPD_CAT) $(LIGHTTPD_PATCH_FILE)|patch -p1)
+endif
+ if [ -d $(LIGHTTPD_DIR)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(LIGHTTPD_DIR) $(LIGHTTPD_DIR)/debian/patches \*.dpatch ; \
+ fi
+ $(CONFIG_UPDATE) $(@D)
+ $(SED) 's/-lfs/-largefile/g;s/_lfs/_largefile/g' $(LIGHTTPD_DIR)/configure
+ touch $@
$(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
(cd $(LIGHTTPD_DIR); rm -rf config.cache; \
@@ -42,8 +54,10 @@ $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
--with-openssl \
--without-pcre \
--program-prefix="" \
+ $(DISABLE_IPV6) \
+ $(DISABLE_LARGEFILE) \
);
- touch $(LIGHTTPD_DIR)/.configured
+ touch $@
$(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured
$(MAKE) -C $(LIGHTTPD_DIR)