alpine: specify per-module dependencies

thresheek · thresheek · commit dc63f7f2ba54 · 2025-11-19T18:18:34.000-08:00
And use them to compute .deps-module-* targets
diff --git a/alpine/Makefile b/alpine/Makefile
@@ -253,6 +253,9 @@ abuild-module-%: $(BASE_SRC) .deps-module-%
 	}
 
 .deps-module-%:
+	if [ -n "$(MODULE_CONTRIB_DEPS_$*)" ]; then \
+	   cd $(CONTRIB) && make $(foreach dep,$(MODULE_CONTRIB_DEPS_$*),.sum-$(dep)); \
+	fi; \
 	touch $@
 
 nginx-tests:
diff --git a/alpine/Makefile.module-acme b/alpine/Makefile.module-acme
@@ -2,7 +2,9 @@ MODULES+=	acme
 
 MODULE_SUMMARY_acme=	nginx-acme
 
-include $(CONTRIB)/src/nginx-acme/version
+MODULE_CONTRIB_DEPS_acme=	nginx-acme
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_acme),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_acme=	$(NGINX_ACME_VERSION)
 MODULE_RELEASE_acme=	1
@@ -14,10 +16,6 @@ MODULE_SOURCES_acme=	nginx-acme-$(NGINX_ACME_VERSION).tar.gz \
 
 MODULE_CONFARGS_acme=	--add-dynamic-module=$(MODSRC_PREFIX)nginx-acme-$(NGINX_ACME_VERSION)
 
-.deps-module-acme:
-	cd $(CONTRIB) && make .sum-nginx-acme .sum-vendor-nginx-acme
-	touch $@
-
 prerequisites-for-module-acme:
 
 # fixes module dependencies build using rustup-provided rustc/cargo
diff --git a/alpine/Makefile.module-auth-spnego b/alpine/Makefile.module-auth-spnego
@@ -2,7 +2,9 @@ MODULES+=	auth-spnego
 
 MODULE_SUMMARY_auth_spnego=	3rd-party kerberos authentication dynamic module
 
-include $(CONTRIB)/src/spnego-http-auth-nginx-module/version
+MODULE_CONTRIB_DEPS_auth-spnego=	spnego-http-auth-nginx-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_auth-spnego),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_auth_spnego=	$(SPNEGO_HTTP_AUTH_NGINX_MODULE_VERSION)
 MODULE_RELEASE_auth_spnego=	1
@@ -15,10 +17,6 @@ MODULE_PATCHES_auth_spnego=
 
 MODULE_CONFARGS_auth_spnego=	--add-dynamic-module=$(MODSRC_PREFIX)spnego-http-auth-nginx-module-$(SPNEGO_HTTP_AUTH_NGINX_MODULE_GITHASH)
 
-.deps-module-auth-spnego:
-	cd $(CONTRIB) && make .sum-spnego-http-auth-nginx-module
-	touch $@
-
 prerequisites-for-module-auth-spnego:
 
 MODULE_BUILD_DEPENDS_auth_spnego=krb5-dev
diff --git a/alpine/Makefile.module-brotli b/alpine/Makefile.module-brotli
@@ -2,7 +2,9 @@ MODULES+=	brotli
 
 MODULE_SUMMARY_brotli=	3rd-party brotli compression dynamic modules
 
-include $(CONTRIB)/src/ngx_brotli/version
+MODULE_CONTRIB_DEPS_brotli=	ngx_brotli
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_brotli),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_brotli=	$(NGX_BROTLI_VERSION)
 MODULE_RELEASE_brotli=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_brotli=	ngx_brotli-$(NGX_BROTLI_VERSION).tar.gz
 
 MODULE_CONFARGS_brotli=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_brotli-$(NGX_BROTLI_VERSION)rc
 
-.deps-module-brotli:
-	cd $(CONTRIB) && make .sum-ngx_brotli
-	touch $@
-
 MODULE_BUILD_DEPENDS_brotli=brotli-dev
 
 define MODULE_POST_brotli
diff --git a/alpine/Makefile.module-encrypted-session b/alpine/Makefile.module-encrypted-session
@@ -2,8 +2,10 @@ MODULES+=	encrypted-session
 
 MODULE_SUMMARY_encrypted_session=	3rd-party encrypted session dynamic module
 
-include $(CONTRIB)/src/ngx_devel_kit/version
-include $(CONTRIB)/src/encrypted-session-nginx-module/version
+MODULE_CONTRIB_DEPS_encrypted-session=	ngx_devel_kit \
+					encrypted-session-nginx-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_encrypted-session),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_encrypted_session=	$(ENCRYPTED_SESSION_NGINX_MODULE_VERSION)
 MODULE_RELEASE_encrypted_session=	1
@@ -16,12 +18,6 @@ MODULE_SOURCES_encrypted_session= 	ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION).tar.gz
 MODULE_CONFARGS_encrypted_session=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION) \
 					--add-dynamic-module=$(MODSRC_PREFIX)encrypted-session-nginx-module-$(ENCRYPTED_SESSION_NGINX_MODULE_VERSION)
 
-.deps-module-encrypted-session:
-	cd $(CONTRIB) && make \
-		.sum-ngx_devel_kit \
-		.sum-encrypted-session-nginx-module
-	touch $@
-
 prerequisites-for-module-encrypted-session: module-ndk
 
 MODULE_DEPENDS_encrypted_session=$(NDK_DEPENDENCY_TAG)
diff --git a/alpine/Makefile.module-fips-check b/alpine/Makefile.module-fips-check
@@ -2,7 +2,9 @@ MODULES+=	fips-check
 
 MODULE_SUMMARY_fips_check=	3rd-party FIPS status check dynamic module
 
-include $(CONTRIB)/src/nginx-fips-check-module/version
+MODULE_CONTRIB_DEPS_fips-check=	nginx-fips-check-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_fips-check),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_fips_check=	$(NGINX_FIPS_CHECK_MODULE_VERSION)
 MODULE_RELEASE_fips_check=	1
@@ -15,10 +17,6 @@ MODULE_PATCHES_fips_check= $(CONTRIB)/src/nginx-fips-check-module/0001-Added-sup
 
 MODULE_CONFARGS_fips_check=	--add-dynamic-module=$(MODSRC_PREFIX)nginx-fips-check-module-$(NGINX_FIPS_CHECK_MODULE_VERSION)
 
-.deps-module-fips-check:
-	cd $(CONTRIB) && make .sum-nginx-fips-check-module
-	touch $@
-
 prerequisites-for-module-fips-check:
 
 define MODULE_POST_fips_check
diff --git a/alpine/Makefile.module-geoip2 b/alpine/Makefile.module-geoip2
@@ -2,7 +2,9 @@ MODULES+=	geoip2
 
 MODULE_SUMMARY_geoip2=	3rd-party GeoIP2 dynamic modules
 
-include $(CONTRIB)/src/ngx_http_geoip2_module/version
+MODULE_CONTRIB_DEPS_geoip2=	ngx_http_geoip2_module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_geoip2),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_geoip2=	$(GEOIP2_NGINX_MODULE_VERSION)
 MODULE_RELEASE_geoip2=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_geoip2=	ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION).tar
 
 MODULE_CONFARGS_geoip2=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION)
 
-.deps-module-geoip2:
-	cd $(CONTRIB) && make .sum-ngx_http_geoip2_module
-	touch $@
-
 prerequisites-for-module-geoip2:
 
 MODULE_BUILD_DEPENDS_geoip2=libmaxminddb-dev
diff --git a/alpine/Makefile.module-headers-more b/alpine/Makefile.module-headers-more
@@ -2,7 +2,9 @@ MODULES+=	headers-more
 
 MODULE_SUMMARY_headers_more=	3rd-party headers-more dynamic module
 
-include $(CONTRIB)/src/headers-more-nginx-module/version
+MODULE_CONTRIB_DEPS_headers-more=	headers-more-nginx-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_headers-more),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_headers_more=	$(HEADERS_MORE_NGINX_MODULE_VERSION)
 MODULE_RELEASE_headers_more=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_headers_more=	headers-more-nginx-module-$(HEADERS_MORE_NGINX_MODU
 
 MODULE_CONFARGS_headers_more=	--add-dynamic-module=$(MODSRC_PREFIX)headers-more-nginx-module-$(HEADERS_MORE_NGINX_MODULE_GITHASH)
 
-.deps-module-headers-more:
-	cd $(CONTRIB) && make .sum-headers-more-nginx-module
-	touch $@
-
 prerequisites-for-module-headers-more:
 
 define MODULE_POST_headers_more
diff --git a/alpine/Makefile.module-lua b/alpine/Makefile.module-lua
@@ -2,12 +2,14 @@ MODULES+=	lua
 
 MODULE_SUMMARY_lua=	3rd-party Lua dynamic modules
 
-include $(CONTRIB)/src/luajit2/version
-include $(CONTRIB)/src/ngx_devel_kit/version
-include $(CONTRIB)/src/lua-nginx-module/version
-include $(CONTRIB)/src/stream-lua-nginx-module/version
-include $(CONTRIB)/src/lua-resty-core/version
-include $(CONTRIB)/src/lua-resty-lrucache/version
+MODULE_CONTRIB_DEPS_lua=	luajit2 \
+				ngx_devel_kit \
+				lua-nginx-module \
+				stream-lua-nginx-module \
+				lua-resty-core \
+				lua-resty-lrucache
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_lua),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_lua=	$(LUA_NGINX_MODULE_VERSION)
 MODULE_RELEASE_lua=	1
@@ -31,16 +33,6 @@ MODULE_CONFARGS_lua=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_devel_kit-$(NGX_DE
 			--add-dynamic-module=$(MODSRC_PREFIX)lua-nginx-module-$(LUA_NGINX_MODULE_VERSION) \
 			--add-dynamic-module=$(MODSRC_PREFIX)stream-lua-nginx-module-$(STREAM_LUA_NGINX_MODULE_VERSION)
 
-.deps-module-lua:
-	cd $(CONTRIB) && make \
-		.sum-luajit2 \
-		.sum-ngx_devel_kit \
-		.sum-lua-nginx-module \
-		.sum-stream-lua-nginx-module \
-		.sum-lua-resty-core \
-		.sum-lua-resty-lrucache
-	touch $@
-
 prerequisites-for-module-lua: module-ndk
 
 MODULE_DEPENDS_lua=$(NDK_DEPENDENCY_TAG)
diff --git a/alpine/Makefile.module-ndk b/alpine/Makefile.module-ndk
@@ -2,7 +2,9 @@ MODULES+=	ndk
 
 MODULE_SUMMARY_ndk=	3rd-party NDK dynamic module
 
-include $(CONTRIB)/src/ngx_devel_kit/version
+MODULE_CONTRIB_DEPS_ndk=	ngx_devel_kit
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_ndk),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_ndk=	$(NGX_DEVEL_KIT_VERSION)
 MODULE_RELEASE_ndk=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_ndk=	ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION).tar.gz
 
 MODULE_CONFARGS_ndk=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION)
 
-.deps-module-ndk:
-	cd $(CONTRIB) && make .sum-ngx_devel_kit
-	touch $@
-
 prerequisites-for-module-ndk:
 
 MODULE_CC_OPT_ndk=-DNDK_SET_VAR -DNDK_UPSTREAM_LIST
diff --git a/alpine/Makefile.module-njs b/alpine/Makefile.module-njs
@@ -2,8 +2,10 @@ MODULES+=	njs
 
 MODULE_SUMMARY_njs=	njs dynamic modules
 
-include $(CONTRIB)/src/njs/version
-include $(CONTRIB)/src/quickjs/version
+MODULE_CONTRIB_DEPS_njs=	njs \
+				quickjs
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_njs),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_njs=	$(NJS_VERSION)
 MODULE_RELEASE_njs=	1
@@ -16,12 +18,6 @@ MODULE_CONFARGS_njs=	--add-dynamic-module=$(MODSRC_PREFIX)njs-$(NJS_VERSION)/ngi
 
 MODULE_PATCHES_njs= $(CONTRIB)/src/quickjs/quickjs.makefile.patch
 
-.deps-module-njs:
-	cd $(CONTRIB) && make \
-						.sum-njs \
-						.sum-quickjs
-	touch $@
-
 MODULE_VERSION_PREFIX_njs=$(MODULE_TARGET_PREFIX)
 MODULE_BUILD_DEPENDS_njs=libedit-dev libxml2-dev libxslt-dev
 
diff --git a/alpine/Makefile.module-otel b/alpine/Makefile.module-otel
@@ -2,10 +2,14 @@ MODULES+=	otel
 
 MODULE_SUMMARY_otel=	OpenTelemetry dynamic module
 
-include $(CONTRIB)/src/nginx-otel/version
-include $(CONTRIB)/src/opentelemetry-cpp/version
-include $(CONTRIB)/src/opentelemetry-proto/version
-include $(CONTRIB)/src/protobuf/version
+MODULE_CONTRIB_DEPS_otel=	nginx-otel \
+							abseil-cpp \
+							grpc \
+							opentelemetry-cpp \
+							opentelemetry-proto \
+							protobuf
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_otel),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_otel=	$(NGINX_OTEL_VERSION)
 MODULE_RELEASE_otel=	1
@@ -21,14 +25,6 @@ MODULE_PATCHES_otel=
 
 MODULE_CONFARGS_otel=   --add-dynamic-module=$(MODSRC_PREFIX)/nginx-otel-$(NGINX_OTEL_GITHASH)/
 
-.deps-module-otel:
-	cd $(CONTRIB) && make \
-		.sum-opentelemetry-cpp \
-		.sum-opentelemetry-proto \
-		.sum-protobuf \
-		.sum-nginx-otel
-	touch $@
-
 prerequisites-for-module-otel:
 
 MODULE_BUILD_DEPENDS_otel=cmake protobuf-dev grpc-dev
diff --git a/alpine/Makefile.module-passenger b/alpine/Makefile.module-passenger
@@ -2,7 +2,9 @@ MODULES+=	passenger
 
 MODULE_SUMMARY_passenger=	3rd-party Passenger dynamic module
 
-include $(CONTRIB)/src/passenger/version
+MODULE_CONTRIB_DEPS_passenger=	passenger
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_passenger),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_passenger=	$(PASSENGER_VERSION)
 MODULE_RELEASE_passenger=	1
@@ -16,10 +18,6 @@ MODULE_PATCHES_passenger=	$(CONTRIB)/src/passenger/build-nginx.rb.patch \
 
 MODULE_CONFARGS_passenger=	--add-dynamic-module=$(MODSRC_PREFIX)passenger-$(PASSENGER_VERSION)/src/nginx_module
 
-.deps-module-passenger:
-	cd $(CONTRIB) && make .sum-passenger
-	touch $@
-
 prerequisites-for-module-passenger:
 
 MODULE_BUILD_DEPENDS_passenger=ruby-dev ruby-rake ruby-etc
diff --git a/alpine/Makefile.module-rtmp b/alpine/Makefile.module-rtmp
@@ -2,7 +2,9 @@ MODULES+=	rtmp
 
 MODULE_SUMMARY_rtmp=	3rd-party RTMP dynamic module
 
-include $(CONTRIB)/src/nginx-rtmp-module/version
+MODULE_CONTRIB_DEPS_rtmp=	nginx-rtmp-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_rtmp),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_rtmp=	$(NGINX_RTMP_MODULE_VERSION)
 MODULE_RELEASE_rtmp=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_rtmp=	nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION).tar.gz
 
 MODULE_CONFARGS_rtmp=	--add-dynamic-module=$(MODSRC_PREFIX)nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION)
 
-.deps-module-rtmp:
-	cd $(CONTRIB) && make .sum-nginx-rtmp-module
-	touch $@
-
 prerequisites-for-module-rtmp:
 
 define MODULE_POST_rtmp
diff --git a/alpine/Makefile.module-set-misc b/alpine/Makefile.module-set-misc
@@ -2,8 +2,10 @@ MODULES+=	set-misc
 
 MODULE_SUMMARY_set_misc=	3rd-party set-misc dynamic module
 
-include $(CONTRIB)/src/ngx_devel_kit/version
-include $(CONTRIB)/src/set-misc-nginx-module/version
+MODULE_CONTRIB_DEPS_set-misc=	ngx_devel_kit \
+				set-misc-nginx-module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_set-misc),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_set_misc=	$(SET_MISC_NGINX_MODULE_VERSION)
 MODULE_RELEASE_set_misc=	1
@@ -16,12 +18,6 @@ MODULE_SOURCES_set_misc=	ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION).tar.gz \
 MODULE_CONFARGS_set_misc=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_devel_kit-$(NGX_DEVEL_KIT_VERSION) \
 				--add-dynamic-module=$(MODSRC_PREFIX)set-misc-nginx-module-$(SET_MISC_NGINX_MODULE_VERSION)
 
-.deps-module-set-misc:
-	cd $(CONTRIB) && make \
-		.sum-ngx_devel_kit \
-		.sum-set-misc-nginx-module
-	touch $@
-
 prerequisites-for-module-set-misc: module-ndk
 
 MODULE_DEPENDS_set_misc=$(NDK_DEPENDENCY_TAG)
diff --git a/alpine/Makefile.module-subs-filter b/alpine/Makefile.module-subs-filter
@@ -2,7 +2,9 @@ MODULES+=	subs-filter
 
 MODULE_SUMMARY_subs_filter=	3rd-party substitution dynamic module
 
-include $(CONTRIB)/src/ngx_http_substitutions_filter_module/version
+MODULE_CONTRIB_DEPS_subs-filter=	ngx_http_substitutions_filter_module
+
+include $(foreach dep,$(MODULE_CONTRIB_DEPS_subs-filter),$(CONTRIB)/src/$(dep)/version)
 
 MODULE_VERSION_subs_filter=	$(SUBSTITUTIONS_FILTER_NGINX_MODULE_VERSION)
 MODULE_RELEASE_subs_filter=	1
@@ -13,10 +15,6 @@ MODULE_SOURCES_subs_filter=	ngx_http_substitutions_filter_module-$(SUBSTITUTIONS
 
 MODULE_CONFARGS_subs_filter=	--add-dynamic-module=$(MODSRC_PREFIX)ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH)
 
-.deps-module-subs-filter:
-	cd $(CONTRIB) && make .sum-ngx_http_substitutions_filter_module
-	touch $@
-
 prerequisites-for-module-subs-filter:
 
 define MODULE_POST_subs_filter

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,9 @@ abuild-module-%: $(BASE_SRC) .deps-module-%`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`.deps-module-%:`
	`256`	`+ if [ -n "$(MODULE_CONTRIB_DEPS_$*)" ]; then \`
	`257`	`+ cd $(CONTRIB) && make $(foreach dep,$(MODULE_CONTRIB_DEPS_$*),.sum-$(dep)); \`
	`258`	`+ fi; \`
`256`	`259`	`touch $@`
`257`	`260`
`258`	`261`	`nginx-tests:`