[master] 3656e3b Now filter the vmods symbols, and make libvmod_debug exercise the $Event RST test again.

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


commit 3656e3b660618b35e63eed0e5b012fac40fa1762
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 11 11:18:47 2017 +0000

    Now filter the vmods symbols, and make libvmod_debug exercise the
    $Event RST test again.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index b7f58e5..2325c50 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -68,6 +68,7 @@ libvmod_XXX_la_CFLAGS = \\
 libvmod_XXX_la_LDFLAGS = \\
 	$(AM_LDFLAGS) \\
 	$(VMOD_LDFLAGS) \\
+	-export-symbols-regex '^Vmod_XXX_Data' \\
 	@SAN_LDFLAGS@
 
 nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 3b4ed7a..2971a68 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -20,6 +20,7 @@ libvmod_blob_la_CFLAGS = \
 libvmod_blob_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
+	-export-symbols-regex '^Vmod_blob_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_blob_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index d328960..a15b241 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = \
 vmoddir = $(pkglibdir)/vmods
 vmod_srcdir = $(top_srcdir)/lib/libvmod_debug
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs = --strict
+vmodtoolargs =
 
 
 noinst_LTLIBRARIES = libvmod_debug.la
@@ -27,10 +27,7 @@ libvmod_debug_la_CFLAGS = \
 
 libvmod_debug_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
+	$(VMOD_LDFLAGS) \
 	-rpath /nowhere \
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index 2ed8a9e..324d389 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -37,6 +37,8 @@ of VMOD handling in Varnish.
 
 $Event event_function
 
+You are not supposed to be able to see this text in the .RST
+
 $Function VOID panic(STRING_LIST)
 
 Don't.
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index 19e10a3..b949004 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -20,6 +20,7 @@ libvmod_directors_la_CFLAGS = \
 libvmod_directors_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
+	-export-symbols-regex '^Vmod_directors_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_directors_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index 3a5b4a5..ef9f8a3 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -20,6 +20,7 @@ libvmod_purge_la_CFLAGS = \
 libvmod_purge_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
+	-export-symbols-regex '^Vmod_purge_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_purge_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 66410b0..8ad8dae 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -20,6 +20,7 @@ libvmod_std_la_CFLAGS = \
 libvmod_std_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
+	-export-symbols-regex '^Vmod_std_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_std_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 1eb8f6f..20e0848 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -20,6 +20,7 @@ libvmod_vtc_la_CFLAGS = \
 libvmod_vtc_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(VMOD_LDFLAGS) \
+	-export-symbols-regex '^Vmod_vtc_Data' \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_vtc_la_SOURCES = vcc_if.c vcc_if.h


More information about the varnish-commit mailing list