[master] da91fec We don't actually have VMOD_LDFLAGS from varnish.m4 in our build.

Poul-Henning Kamp phk at FreeBSD.org
Mon Sep 11 20:11:05 UTC 2017


commit da91fec9533603a35c9495f89cdb263a78c3b3fa
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 11 19:58:26 2017 +0000

    We don't actually have VMOD_LDFLAGS from varnish.m4 in our build.
    
    Spotted by:	fgs

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 2325c50..3a4472c 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -67,7 +67,7 @@ libvmod_XXX_la_CFLAGS = \\
 
 libvmod_XXX_la_LDFLAGS = \\
 	$(AM_LDFLAGS) \\
-	$(VMOD_LDFLAGS) \\
+	-module -export-dynamic -avoid-version -shared \\
 	-export-symbols-regex '^Vmod_XXX_Data' \\
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 2971a68..ae78a9a 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_blob_la_CFLAGS = \
 
 libvmod_blob_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-export-symbols-regex '^Vmod_blob_Data' \
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index a15b241..e5f13a2 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -27,8 +27,9 @@ libvmod_debug_la_CFLAGS = \
 
 libvmod_debug_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-rpath /nowhere \
+	-export-symbols-regex '^Vmod_debug_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_debug_la_SOURCES = \
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index b949004..21a702d 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_directors_la_CFLAGS = \
 
 libvmod_directors_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-export-symbols-regex '^Vmod_directors_Data' \
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index ef9f8a3..d8f3803 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_purge_la_CFLAGS = \
 
 libvmod_purge_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-export-symbols-regex '^Vmod_purge_Data' \
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 8ad8dae..cbd9bc9 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_std_la_CFLAGS = \
 
 libvmod_std_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-export-symbols-regex '^Vmod_std_Data' \
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 20e0848..7642a2d 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_vtc_la_CFLAGS = \
 
 libvmod_vtc_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	$(VMOD_LDFLAGS) \
+	-module -export-dynamic -avoid-version -shared \
 	-export-symbols-regex '^Vmod_vtc_Data' \
 	@SAN_LDFLAGS@
 


More information about the varnish-commit mailing list