diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-01 07:18:47 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-01 07:18:47 +0000 |
| commit | 7338f65c77790cce67ba60489ef62084421bcd9d (patch) | |
| tree | c046bdaa6e15ed14cd8c28244d944b27f212423c /openwrt | |
| parent | 2f9debdfd65fb630efae4aad1725f36c6804f2d0 (diff) | |
update to new upstream release (v1.4.2),
fix pcre detection in configure (thanks bero for reporting)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1817 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/package/lighttpd/Makefile | 4 | ||||
| -rw-r--r-- | openwrt/package/lighttpd/patches/500-configure_cross.patch | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/openwrt/package/lighttpd/Makefile b/openwrt/package/lighttpd/Makefile index faf130e4bd..c047b7a661 100644 --- a/openwrt/package/lighttpd/Makefile +++ b/openwrt/package/lighttpd/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd -PKG_VERSION:=1.3.16 +PKG_VERSION:=1.4.2 PKG_RELEASE:=1 -PKG_MD5SUM:=b73f7a7ace4901b6417b0e450aaa5df5 +PKG_MD5SUM:=c26eea734490129a45e465ac0f327e4a PKG_SOURCE_URL:=http://www.lighttpd.net/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/openwrt/package/lighttpd/patches/500-configure_cross.patch b/openwrt/package/lighttpd/patches/500-configure_cross.patch new file mode 100644 index 0000000000..8f8099823f --- /dev/null +++ b/openwrt/package/lighttpd/patches/500-configure_cross.patch @@ -0,0 +1,24 @@ +diff -ruN lighttpd-1.4.2-old/configure lighttpd-1.4.2-new/configure +--- lighttpd-1.4.2-old/configure 2005-08-29 14:18:11.000000000 +0200 ++++ lighttpd-1.4.2-new/configure 2005-09-01 09:06:29.000000000 +0200 +@@ -23849,7 +23849,7 @@ + echo "$as_me:$LINENO: result: $WITH_PCRE" >&5 + echo "${ECHO_T}$WITH_PCRE" >&6 + +-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then ++if test "$WITH_PCRE" != "no"; then + # Extract the first word of "pcre-config", so it can be a program name with args. + set dummy pcre-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 +diff -ruN lighttpd-1.4.2-old/configure.in lighttpd-1.4.2-new/configure.in +--- lighttpd-1.4.2-old/configure.in 2005-08-29 14:06:03.000000000 +0200 ++++ lighttpd-1.4.2-new/configure.in 2005-09-01 09:05:39.000000000 +0200 +@@ -222,7 +222,7 @@ + [WITH_PCRE=$withval],[WITH_PCRE=yes]) + AC_MSG_RESULT([$WITH_PCRE]) + +-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then ++if test "$WITH_PCRE" != "no"; then + AC_PATH_PROG(PCRECONFIG, pcre-config) + + if test x"$PCRECONFIG" != x; then |