[master] a9665427f build: Make the VMOD symbols regex extensible

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Jan 7 14:16:07 UTC 2021 

commit a9665427f62bcad7d0d7b2eff00744d45db79743
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jan 5 17:15:43 2021 +0100

    build: Make the VMOD symbols regex extensible
    
    That will hopefully not break macos this time.
    
    Refs 8b79193094cc

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 4250b816b..ad58a3c7d 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -63,11 +63,13 @@ vmodtoolargs ?= --strict --boilerplate -o PFX
 
 vmod_LTLIBRARIES = libvmod_XXX.la
 
-libvmod_XXX_la_CFLAGS ?= \\
+libvmod_XXX_la_CFLAGS = \\
 \t at SAN_CFLAGS@
 
+vmod_XXX_symbols_regex ?= Vmod_XXX_Data
+
 libvmod_XXX_la_LDFLAGS = \\
-\t-export-symbols-regex 'Vmod_XXX_Data' \\
+\t-export-symbols-regex $(vmod_XXX_symbols_regex) \\
 \t$(AM_LDFLAGS) \\
 \t$(VMOD_LDFLAGS) \\
 \t at SAN_LDFLAGS@
diff --git a/lib/libvmod_blob/automake_boilerplate_blob.am b/lib/libvmod_blob/automake_boilerplate_blob.am
index eddb2c8b7..19db88cba 100644
--- a/lib/libvmod_blob/automake_boilerplate_blob.am
+++ b/lib/libvmod_blob/automake_boilerplate_blob.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_blob_if
 
 vmod_LTLIBRARIES = libvmod_blob.la
 
-libvmod_blob_la_CFLAGS ?= \
+libvmod_blob_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_blob_symbols_regex ?= Vmod_blob_Data
+
 libvmod_blob_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_blob_Data' \
+	-export-symbols-regex $(vmod_blob_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_cookie/automake_boilerplate_cookie.am b/lib/libvmod_cookie/automake_boilerplate_cookie.am
index f03d43f1f..aa6867d7e 100644
--- a/lib/libvmod_cookie/automake_boilerplate_cookie.am
+++ b/lib/libvmod_cookie/automake_boilerplate_cookie.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_cookie_if
 
 vmod_LTLIBRARIES = libvmod_cookie.la
 
-libvmod_cookie_la_CFLAGS ?= \
+libvmod_cookie_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_cookie_symbols_regex ?= Vmod_cookie_Data
+
 libvmod_cookie_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_cookie_Data' \
+	-export-symbols-regex $(vmod_cookie_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 687711aef..60b0757eb 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -5,16 +5,10 @@ libvmod_debug_la_SOURCES = \
 	vmod_debug_obj.c \
 	vmod_debug_dyn.c
 
-
 include $(srcdir)/automake_boilerplate_debug.am
 
 # Allow Vmod_wrong*_Data to be exported
-libvmod_debug_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_.*_Data' \
-	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
-	@SAN_LDFLAGS@
-
+vmod_debug_symbols_regex = 'Vmod_.*_Data'
 
 # not --strict
 vmodtoolargs = --boilerplate -o vcc_debug_if
diff --git a/lib/libvmod_debug/automake_boilerplate_debug.am b/lib/libvmod_debug/automake_boilerplate_debug.am
index 1c7f86e7b..ec97cc5be 100644
--- a/lib/libvmod_debug/automake_boilerplate_debug.am
+++ b/lib/libvmod_debug/automake_boilerplate_debug.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_debug_if
 
 vmod_LTLIBRARIES = libvmod_debug.la
 
-libvmod_debug_la_CFLAGS ?= \
+libvmod_debug_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_debug_symbols_regex ?= Vmod_debug_Data
+
 libvmod_debug_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_debug_Data' \
+	-export-symbols-regex $(vmod_debug_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_directors/automake_boilerplate_directors.am b/lib/libvmod_directors/automake_boilerplate_directors.am
index 182f418e0..ae29235f1 100644
--- a/lib/libvmod_directors/automake_boilerplate_directors.am
+++ b/lib/libvmod_directors/automake_boilerplate_directors.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_directors_if
 
 vmod_LTLIBRARIES = libvmod_directors.la
 
-libvmod_directors_la_CFLAGS ?= \
+libvmod_directors_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_directors_symbols_regex ?= Vmod_directors_Data
+
 libvmod_directors_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_directors_Data' \
+	-export-symbols-regex $(vmod_directors_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_proxy/automake_boilerplate_proxy.am b/lib/libvmod_proxy/automake_boilerplate_proxy.am
index 5d744f2e8..cad272c9f 100644
--- a/lib/libvmod_proxy/automake_boilerplate_proxy.am
+++ b/lib/libvmod_proxy/automake_boilerplate_proxy.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_proxy_if
 
 vmod_LTLIBRARIES = libvmod_proxy.la
 
-libvmod_proxy_la_CFLAGS ?= \
+libvmod_proxy_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_proxy_symbols_regex ?= Vmod_proxy_Data
+
 libvmod_proxy_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_proxy_Data' \
+	-export-symbols-regex $(vmod_proxy_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_purge/automake_boilerplate_purge.am b/lib/libvmod_purge/automake_boilerplate_purge.am
index 259232ca9..9988d5dfa 100644
--- a/lib/libvmod_purge/automake_boilerplate_purge.am
+++ b/lib/libvmod_purge/automake_boilerplate_purge.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_purge_if
 
 vmod_LTLIBRARIES = libvmod_purge.la
 
-libvmod_purge_la_CFLAGS ?= \
+libvmod_purge_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_purge_symbols_regex ?= Vmod_purge_Data
+
 libvmod_purge_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_purge_Data' \
+	-export-symbols-regex $(vmod_purge_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_std/automake_boilerplate_std.am b/lib/libvmod_std/automake_boilerplate_std.am
index f4648b226..8201d962b 100644
--- a/lib/libvmod_std/automake_boilerplate_std.am
+++ b/lib/libvmod_std/automake_boilerplate_std.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_std_if
 
 vmod_LTLIBRARIES = libvmod_std.la
 
-libvmod_std_la_CFLAGS ?= \
+libvmod_std_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_std_symbols_regex ?= Vmod_std_Data
+
 libvmod_std_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_std_Data' \
+	-export-symbols-regex $(vmod_std_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_unix/automake_boilerplate_unix.am b/lib/libvmod_unix/automake_boilerplate_unix.am
index f1256e205..d9a4f9c0e 100644
--- a/lib/libvmod_unix/automake_boilerplate_unix.am
+++ b/lib/libvmod_unix/automake_boilerplate_unix.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_unix_if
 
 vmod_LTLIBRARIES = libvmod_unix.la
 
-libvmod_unix_la_CFLAGS ?= \
+libvmod_unix_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_unix_symbols_regex ?= Vmod_unix_Data
+
 libvmod_unix_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_unix_Data' \
+	-export-symbols-regex $(vmod_unix_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
diff --git a/lib/libvmod_vtc/automake_boilerplate_vtc.am b/lib/libvmod_vtc/automake_boilerplate_vtc.am
index fd6124c01..53579929b 100644
--- a/lib/libvmod_vtc/automake_boilerplate_vtc.am
+++ b/lib/libvmod_vtc/automake_boilerplate_vtc.am
@@ -12,11 +12,13 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_vtc_if
 
 vmod_LTLIBRARIES = libvmod_vtc.la
 
-libvmod_vtc_la_CFLAGS ?= \
+libvmod_vtc_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmod_vtc_symbols_regex ?= Vmod_vtc_Data
+
 libvmod_vtc_la_LDFLAGS = \
-	-export-symbols-regex 'Vmod_vtc_Data' \
+	-export-symbols-regex $(vmod_vtc_symbols_regex) \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@

More information about the varnish-commit mailing list