From f7f7124ee0a1fa328f26fb1b6ca940bc0018f5e3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 15 Dec 2021 22:38:23 +0100 Subject: [PATCH] package/lighttpd: add xxhash mandatory dependency Add xxhash mandatory dependency to avoid the following build failure with the embedded xxhash (in version 0.8.1) and uclibc raised since bump to version 1.4.63 in commit 2a002466459a17f44f565209a9cfd8512676ca47 and https://github.com/lighttpd/lighttpd1.4/commit/23b07fa3efde70b76afa5380b1602d0515aedd46: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: src/lighttpd.p/algo_xxhash.c.o: in function `XXH32_canonicalFromHash': /home/buildroot/autobuild/instance-0/output-1/build/lighttpd-1.4.63/build/../src/algo_xxhash.h:2282: undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/7b644dce244a1aa4a193a3196059a56b2c4c7591 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lighttpd/Config.in | 1 + package/lighttpd/lighttpd.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index e9a5aa34f0..9f593a9228 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIGHTTPD bool "lighttpd" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_XXHASH help lighttpd a secure, fast, compliant and very flexible web-server which has been optimized for high-performance diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 98e84e8de8..5d53767263 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -11,7 +11,7 @@ LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSIO LIGHTTPD_LICENSE = BSD-3-Clause LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd -LIGHTTPD_DEPENDENCIES = host-pkgconf +LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ -Dwith_brotli=false \ -Dwith_dbi=false \ @@ -33,7 +33,7 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=false \ + -Dwith_xxhash=true \ -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \