Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lighttpd/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

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

Expand All @@ -27,6 +27,9 @@ fi
# Apply patches
#
for patchfile in "${PREFIX_PORT}"/patches/*.patch; do
if [ ! -f "$patchfile" ]; then
continue;
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: in phoenix-rtos-ports/build.subr we have common helper functions, currently only download and patch functions, which are meant to be more sophisticated and cover most build use cases in ports. See phoenix-rtos-ports/lua/build.sh for an example usage. Not all ports were rewritten to use these functions (yet).

Rewriting this build.sh is probably out of scope of this PR, but feel free to do it later.

if [ ! -f "$PREFIX_LIGHTTPD_MARKERS/$(basename "$patchfile").applied" ]; then
echo "applying patch: $patchfile"
patch -d "$PREFIX_LIGHTTPD_SRC" -p1 < "$patchfile"
Expand All @@ -42,10 +45,10 @@ if [ ! -f "$PREFIX_PORT_BUILD/config.h" ]; then
CONFIGFILE=$(find "${PREFIX_ROOTFS:?PREFIX_ROOTFS not set!}/etc" -name "lighttpd.conf")
grep mod_ "$CONFIGFILE" | cut -d'"' -f2 | xargs -L1 -I{} echo "PLUGIN_INIT({})" > "$PREFIX_LIGHTTPD_SRC"/src/plugin-static.h

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

( cd "$PREFIX_LIGHTTPD_SRC" && "./autogen.sh" )
( cd "$PREFIX_PORT_BUILD" && "$PREFIX_LIGHTTPD_SRC/configure" LIGHTTPD_STATIC=yes CFLAGS="${LIGHTTPD_CFLAGS} ${CFLAGS}" CPPFLAGS="" LDFLAGS="${LDFLAGS}" AR_FLAGS="-r" \
-C --disable-ipv6 --disable-mmap --with-bzip2=no \
--with-zlib="$WITH_ZLIB" --enable-shared=no --enable-static=yes --disable-shared --host="$HOST" --with-openssl="${PREFIX_OPENSSL}" --with-pcre="${PREFIX_PCRE}" \
Expand Down
12 changes: 0 additions & 12 deletions lighttpd/patches/arpa_inet_include.patch

This file was deleted.

16 changes: 0 additions & 16 deletions lighttpd/patches/fdevent_del_bug_fix.patch

This file was deleted.

17 changes: 0 additions & 17 deletions lighttpd/patches/fionread_bug.patch

This file was deleted.

102 changes: 0 additions & 102 deletions lighttpd/patches/makefile_wstunnel.patch

This file was deleted.

16 changes: 0 additions & 16 deletions lighttpd/patches/mod_cgi_mmap_fix.patch

This file was deleted.

39 changes: 0 additions & 39 deletions lighttpd/patches/mod_compress_fix.patch

This file was deleted.

16 changes: 0 additions & 16 deletions lighttpd/patches/stream_mmap_fix.patch

This file was deleted.

Loading