www-servers/nginx: Fix building of nginScript with -O3

Closes: https://bugs.gentoo.org/647958
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch b/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch
new file mode 100644 (file)
index 0000000..55b7136
--- /dev/null
+++ b/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch
@@ -0,0 +1,24 @@
+Origin: https://hg.nginx.org/njs/rev/22cc52416e84
+
+Bug: https://bugs.gentoo.org/647958
+
+--- a/njs/njs_fs.c
++++ b/njs/njs_fs.c
+@@ -566,6 +566,8 @@
+     }
+ 
+     mode = NULL;
++    /* GCC complains about uninitialized flag.length. */
++    flag.length = 0;
+     flag.start = NULL;
+     encoding.length = 0;
+     encoding.start = NULL;
+@@ -753,6 +755,8 @@
+     }
+ 
+     mode = NULL;
++    /* GCC complains about uninitialized flag.length. */
++    flag.length = 0;
+     flag.start = NULL;
+     encoding.length = 0;
+     encoding.start = NULL;

diff --git a/www-servers/nginx/nginx-1.13.8-r1.ebuild b/www-servers/nginx/nginx-1.13.8-r1.ebuild
index 252999d3fe6f7499f05bc076871f49d1fd5c212e..82920e6b89dfd1ab0857094d58641da8e4bdcda9 100644 (file)
--- a/www-servers/nginx/nginx-1.13.8-r1.ebuild
+++ b/www-servers/nginx/nginx-1.13.8-r1.ebuild
@@ -153,7 +153,7 @@ HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 NJS_MODULE_PV="0.1.15"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}/nginx"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 
 # We handle deps below ourselves
 SSL_DEPS_SKIP=1
@@ -373,6 +373,12 @@ src_prepare() {
                cd "${S}" || die
        fi
 
+       if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+               cd "${NJS_MODULE_WD}" || die
+               eapply "${FILESDIR}"/njs-0.1.15-fix-o3-building.patch
+               cd "${S}" || die
+       fi
+
        if use nginx_modules_http_upstream_check; then
                #eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
                eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
@@ -576,7 +582,7 @@ src_configure() {
        fi
 
        if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-               myconf+=( --add-module=${NJS_MODULE_WD} )
+               myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
        fi
 
        if use nginx_modules_http_brotli; then