Merge branch 'nginx-comp' into 'master'

Fix nginx cflags, add openssl3 and http v3 module

See merge request redox-os/redox!1939
This commit is contained in:
Jeremy Soller 2026-02-24 06:29:58 -07:00
commit ad6e7e8674
2 changed files with 29 additions and 2 deletions

View File

@ -9,7 +9,7 @@ patches = [
template = "custom"
dependencies = [
"pcre",
"openssl1",
"openssl3",
"zlib",
]
script = """
@ -19,7 +19,7 @@ ARCH="${TARGET%%-*}"
COOKBOOK_CONFIGURE_FLAGS=(
--crossbuild=Redox:$ARCH
--with-cc="$CC"
--with-cc-opt="$CFLAGS"
--with-cc-opt="$CFLAGS $CPPFLAGS"
--with-ld-opt="$LDFLAGS"
--sbin-path=/usr/bin/nginx
--modules-path=/usr/lib/nginx/modules
@ -46,6 +46,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
--with-threads
--with-http_ssl_module
--with-http_v2_module
--with-http_v3_module
--with-http_realip_module
--with-http_gzip_static_module
--with-http_stub_status_module

View File

@ -1,3 +1,29 @@
diff -ruwN source/auto/cc/clang source-new/auto/cc/clang
--- source/auto/cc/clang 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/cc/clang 2026-02-24 07:55:59.340299231 +0700
@@ -88,9 +88,6 @@
CFLAGS="$CFLAGS -Wno-deprecated-declarations"
fi
-# stop on warning
-CFLAGS="$CFLAGS -Werror"
-
# debug
CFLAGS="$CFLAGS -g"
diff -ruwN source/auto/cc/gcc source-new/auto/cc/gcc
--- source/auto/cc/gcc 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/cc/gcc 2026-02-24 07:56:03.156908192 +0700
@@ -165,9 +165,6 @@
esac
-# stop on warning
-CFLAGS="$CFLAGS -Werror"
-
# debug
CFLAGS="$CFLAGS -g"
diff -ruwN source/auto/feature source-new/auto/feature
--- source/auto/feature 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/feature 2025-09-16 02:44:58.617532926 +0700