Commit 622329d7 authored by Natanael Copa's avatar Natanael Copa

main/nginx: disable njs on mips64, s390x and x86

Test suite is failing for those arches.

fixes #11772
parent c00abf27
......@@ -21,13 +21,13 @@ pkgname=nginx
# NOTE: Upgrade only to even-numbered versions (e.g. 1.14.z, 1.16.z)!
# Odd-numbered versions are mainline (development) versions.
pkgver=1.18.0
pkgrel=2
pkgrel=3
# Revision of nginx-tests to use for check().
_tests_hgrev=c1d167a13c24
_njs_ver=0.4.2
pkgdesc="HTTP and reverse proxy server (stable version)"
url="https://www.nginx.org/"
arch="all !x86" # njs tests fails on x86
arch="all"
license="BSD-2-Clause"
depends=""
makedepends="
......@@ -77,17 +77,21 @@ builddir="$srcdir/$pkgname-$pkgver"
_modules_dir="usr/lib/$pkgname/modules"
_stream_js_depends="$pkgname-mod-stream"
case "$CARCH" in
x86|s390x|mips64) _njs_mods= ;; # has failing tests
*) _njs_mods="http-js stream-js";;
esac
# Built-in dynamic modules
for _mod in \
http-geoip \
http-image-filter \
http-js \
http-perl \
http-xslt-filter \
mail \
stream \
stream-geoip \
stream-js
$_njs_mods
do
subpackages="$subpackages $pkgname-mod-$_mod:_module"
done
......@@ -233,7 +237,7 @@ _build() {
--with-stream_geoip_module=dynamic \
--with-stream_ssl_preread_module \
\
--add-dynamic-module="$srcdir/njs-$_njs_ver/nginx" \
${_njs_mods:+"--add-dynamic-module=$srcdir/njs-$_njs_ver/nginx"} \
$_extra_flags \
"$@"
......@@ -263,7 +267,7 @@ check() {
TEST_NGINX_BINARY="$builddir/objs/nginx" prove .
if [ "$CARCH" != "s390x" ] && [ "$CARCH" != "mips64" ]; then # failing tests in 0.3.9
if [ -n "$_njs_mods" ]; then
msg "Running njs tests..."
cd "$srcdir"/njs-*
make test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment