Skip to content

Commit 6cc3c34

Browse files
gstraussDarchiv
authored andcommitted
lighttpd: lighttpd 1.4.79
* update to lighttpd 1.4.79 * do not error out if patches/*.patch do not exist * revert part of 6cb7bac build: adapt to gcc 14.2 (JIRA: RTOS-927) which modified lighttpd/build.sh to add -Wno-error=implicit-function-declaration * run ./autogen.sh to autoreconf -fi before ./configure lighttpd build
1 parent 9013fcd commit 6cc3c34

8 files changed

Lines changed: 6 additions & 221 deletions

lighttpd/build.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
LIGHTTPD="lighttpd-1.4.53"
5+
LIGHTTPD="lighttpd-1.4.79"
66
PKG_URL="https://download.lighttpd.net/lighttpd/releases-1.4.x/${LIGHTTPD}.tar.gz"
77
PKG_MIRROR_URL="https://files.phoesys.com/ports/${LIGHTTPD}.tar.gz"
88

@@ -27,6 +27,9 @@ fi
2727
# Apply patches
2828
#
2929
for patchfile in "${PREFIX_PORT}"/patches/*.patch; do
30+
if [ ! -f "$patchfile" ]; then
31+
continue;
32+
fi
3033
if [ ! -f "$PREFIX_LIGHTTPD_MARKERS/$(basename "$patchfile").applied" ]; then
3134
echo "applying patch: $patchfile"
3235
patch -d "$PREFIX_LIGHTTPD_SRC" -p1 < "$patchfile"
@@ -42,10 +45,10 @@ if [ ! -f "$PREFIX_PORT_BUILD/config.h" ]; then
4245
CONFIGFILE=$(find "${PREFIX_ROOTFS:?PREFIX_ROOTFS not set!}/etc" -name "lighttpd.conf")
4346
grep mod_ "$CONFIGFILE" | cut -d'"' -f2 | xargs -L1 -I{} echo "PLUGIN_INIT({})" > "$PREFIX_LIGHTTPD_SRC"/src/plugin-static.h
4447

45-
# FIXME: -Wno-error=implicit-function-declaration as lighthttp for some reason doesn't include arpa/inet.h when ntohs is used.
46-
LIGHTTPD_CFLAGS="-DLIGHTTPD_STATIC -DPHOENIX -Wno-error=implicit-function-declaration"
48+
LIGHTTPD_CFLAGS="-DLIGHTTPD_STATIC -DPHOENIX"
4749
WITH_ZLIB="no" && [ "$PORTS_ZLIB" = "y" ] && WITH_ZLIB="yes"
4850

51+
( cd "$PREFIX_LIGHTTPD_SRC" && "./autogen.sh" )
4952
( cd "$PREFIX_PORT_BUILD" && "$PREFIX_LIGHTTPD_SRC/configure" LIGHTTPD_STATIC=yes CFLAGS="${LIGHTTPD_CFLAGS} ${CFLAGS}" CPPFLAGS="" LDFLAGS="${LDFLAGS}" AR_FLAGS="-r" \
5053
-C --disable-ipv6 --disable-mmap --with-bzip2=no \
5154
--with-zlib="$WITH_ZLIB" --enable-shared=no --enable-static=yes --disable-shared --host="$HOST" --with-openssl="${PREFIX_OPENSSL}" --with-pcre="${PREFIX_PCRE}" \

lighttpd/patches/arpa_inet_include.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

lighttpd/patches/fdevent_del_bug_fix.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

lighttpd/patches/fionread_bug.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

lighttpd/patches/makefile_wstunnel.patch

Lines changed: 0 additions & 102 deletions
This file was deleted.

lighttpd/patches/mod_cgi_mmap_fix.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

lighttpd/patches/mod_compress_fix.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

lighttpd/patches/stream_mmap_fix.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)