[master] 8b7919309 Partially revert b82271e5

Federico G. Schwindt fgsch at lodoss.net
Mon Aug 3 14:01:07 UTC 2020


commit 8b79193094ccc5e910e34f2bb1cbb84f0378868d
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 3 14:55:59 2020 +0100

    Partially revert b82271e5
    
    Automake generates a different libtool invocation if ?= is used.
    More investigation needed but for now this is enough to fix make
    check under macos.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 66d6e67fd..c68b30836 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -66,7 +66,7 @@ vmod_LTLIBRARIES = libvmod_XXX.la
 libvmod_XXX_la_CFLAGS ?= \\
 \t at 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 7931bbbf0..60e496959 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_blob.la
 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 bf5214708..88d6167a6 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_cookie.la
 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 b0bc43174..7850094f6 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_debug.la
 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 f12c3c4e8..d84a44076 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_directors.la
 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 a8a257dab..71cd6dab3 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_proxy.la
 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 04904a376..f06b85afe 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_purge.la
 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 6a14779b2..5bd015b9b 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_std.la
 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 f053524a1..fa0586db3 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_unix.la
 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 1d4d60cb9..75f8ccb1f 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -15,7 +15,7 @@ vmod_LTLIBRARIES = libvmod_vtc.la
 libvmod_vtc_la_CFLAGS ?= \
 	@SAN_CFLAGS@
 
-libvmod_vtc_la_LDFLAGS ?= \
+libvmod_vtc_la_LDFLAGS = \
 	-export-symbols-regex 'Vmod_vtc_Data' \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \


More information about the varnish-commit mailing list