[PATCH 03/10] nginx-module.eclass: src_test(): Prepend pkg_sonames with NGINX_S

Zurab Kvachadze <[email protected]> Sat, 18 Jul 2026 19:37:00 +0300
Newsgroups gmane.linux.gentoo.devel
Message-ID <[email protected]>
Before e0b1493dce7b (nginx-module.eclass: Use S as NGINX_MOD_S, use
NGINX_S for build system, 2026-02-08), S pointed to NGINX_S, fake NGINX
build env. In that commit, S was changed to point to what was
NGINX_MOD_S at the time, i.e., the root of the module sources.

Unfortunately, while correctly removing usages of NGINX_MOD_S, I missed
the usage of S as NGINX_S in nginx-module_src_test() in pkg_sonames.

pkg_sonames is an array holding the absolute paths to the shared objects
of the current module. pkg_sonames is used to load those shared objects
to test them in nginx-module_src_test().

We prepend ${S} to each shared object, while actually needing NGINX_S
since e0b1493dce7b.

This commit fixes the definition of pkg_sonames to correctly prepend
NGINX_S instead of S.

Closes: https://bugs.gentoo.org/978429
Signed-off-by: Zurab Kvachadze <[email protected]>
---
 eclass/nginx-module.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/nginx-module.eclass b/eclass/nginx-module.eclass
index 3e6214bc30f3..ddafea253327 100644
--- a/eclass/nginx-module.eclass
+++ b/eclass/nginx-module.eclass
@@ -770,8 +770,8 @@ nginx-module_src_test() {
 	[[ ${#NGINX_MOD_SHARED_OBJECTS[@]} -eq 0 ]] &&
 		die "No shared objects found for the currently built module"
 	# Prepend each member of the NGINX_MOD_SHARED_OBJECTS array with
-	# '${S}/build/' and save the array into pkg_sonames.
-	pkg_sonames=( "${NGINX_MOD_SHARED_OBJECTS[@]/#/${S}/build/}" )
+	# '${NGINX_S}/build/' and save the array into pkg_sonames.
+	pkg_sonames=( "${NGINX_MOD_SHARED_OBJECTS[@]/#/${NGINX_S}/build/}" )
 
 	local pkg
 	for pkg in "${NGINX_MOD_TEST_LOAD_ORDER[@]}"; do
-- 
2.54.0