Mailing List Archive

commit b82271e52d4fc946d4d0856d150730d430c30a89
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Tue Jun 30 11:02:22 2020 +0200

build: Allow VMOD flags to be overridden

We override vmod_debug's LDFLAGS, so that warning is gone.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 61a695b70..66d6e67fd 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -63,10 +63,10 @@ vmodtoolargs ?= --strict --boilerplate -o PFX

vmod_LTLIBRARIES = libvmod_XXX.la

-libvmod_XXX_la_CFLAGS = \\
+libvmod_XXX_la_CFLAGS ?= \\
\t@SAN_CFLAGS@

-libvmod_XXX_la_LDFLAGS = \\
+libvmod_XXX_la_LDFLAGS ?= \\
\t-export-symbols-regex 'Vmod_XXX_Data' \\
\t$(AM_LDFLAGS) \\
\t$(VMOD_LDFLAGS) \\
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 3da6b00a1..7931bbbf0 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_blob_if

vmod_LTLIBRARIES = libvmod_blob.la

-libvmod_blob_la_CFLAGS = \
+libvmod_blob_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_blob_la_LDFLAGS = \
+libvmod_blob_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_blob_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_cookie/automake_boilerplate.am b/lib/libvmod_cookie/automake_boilerplate.am
index c3b52f37b..bf5214708 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_cookie_if

vmod_LTLIBRARIES = libvmod_cookie.la

-libvmod_cookie_la_CFLAGS = \
+libvmod_cookie_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_cookie_la_LDFLAGS = \
+libvmod_cookie_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_cookie_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_debug/automake_boilerplate.am b/lib/libvmod_debug/automake_boilerplate.am
index fe41b579d..b0bc43174 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_debug_if

vmod_LTLIBRARIES = libvmod_debug.la

-libvmod_debug_la_CFLAGS = \
+libvmod_debug_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_debug_la_LDFLAGS = \
+libvmod_debug_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_debug_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index c03bd61d8..f12c3c4e8 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_directors_if

vmod_LTLIBRARIES = libvmod_directors.la

-libvmod_directors_la_CFLAGS = \
+libvmod_directors_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_directors_la_LDFLAGS = \
+libvmod_directors_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_directors_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_proxy/automake_boilerplate.am b/lib/libvmod_proxy/automake_boilerplate.am
index c4a099974..a8a257dab 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_proxy_if

vmod_LTLIBRARIES = libvmod_proxy.la

-libvmod_proxy_la_CFLAGS = \
+libvmod_proxy_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_proxy_la_LDFLAGS = \
+libvmod_proxy_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_proxy_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index 33e9be06c..04904a376 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_purge_if

vmod_LTLIBRARIES = libvmod_purge.la

-libvmod_purge_la_CFLAGS = \
+libvmod_purge_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_purge_la_LDFLAGS = \
+libvmod_purge_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_purge_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 3e84940b8..6a14779b2 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_std_if

vmod_LTLIBRARIES = libvmod_std.la

-libvmod_std_la_CFLAGS = \
+libvmod_std_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_std_la_LDFLAGS = \
+libvmod_std_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_std_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_unix/automake_boilerplate.am b/lib/libvmod_unix/automake_boilerplate.am
index 913bc01c5..f053524a1 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_unix_if

vmod_LTLIBRARIES = libvmod_unix.la

-libvmod_unix_la_CFLAGS = \
+libvmod_unix_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_unix_la_LDFLAGS = \
+libvmod_unix_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_unix_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 1099900f9..1d4d60cb9 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -12,10 +12,10 @@ vmodtoolargs ?= --strict --boilerplate -o vcc_vtc_if

vmod_LTLIBRARIES = libvmod_vtc.la

-libvmod_vtc_la_CFLAGS = \
+libvmod_vtc_la_CFLAGS ?= \
@SAN_CFLAGS@

-libvmod_vtc_la_LDFLAGS = \
+libvmod_vtc_la_LDFLAGS ?= \
-export-symbols-regex 'Vmod_vtc_Data' \
$(AM_LDFLAGS) \
$(VMOD_LDFLAGS) \
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit