aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-07-23 12:04:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-07-23 12:18:56 +0000
commit622329d7eaa3edb14d6626b65d562e54722329fc (patch)
tree3709e65f6052c038cc2779685a74c827e701cb0e
parentc00abf27f40b0475686eb15d1ea9d060ad6f0587 (diff)
downloadaports-622329d7eaa3edb14d6626b65d562e54722329fc.tar.gz
aports-622329d7eaa3edb14d6626b65d562e54722329fc.tar.bz2
aports-622329d7eaa3edb14d6626b65d562e54722329fc.tar.xz
main/nginx: disable njs on mips64, s390x and x86
Test suite is failing for those arches. fixes #11772
-rw-r--r--main/nginx/APKBUILD16
1 files changed, 10 insertions, 6 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 1beb7c1fed..9efc3dee5e 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -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