[master] 90c4b74 Install cache/cache_varnishd.h as part of $ABI strict

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Mar 13 18:00:12 UTC 2018


commit 90c4b747ced9053353c13d827ef0a0df5ab4445f
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 13 18:41:21 2018 +0100

    Install cache/cache_varnishd.h as part of $ABI strict
    
    This removes the need for non-VRT VMODs to require a Varnish source tree
    to build, especially since varnish.m4 only supports Varnish installations
    today and would leave VMOD authors on their own in order to build from
    a source tree. Since $ABI defaults to strict, any VMOD author actively
    choosing vrt compliance is responsible for ensuring it only uses blessed
    symbols.
    
    In our official packages, they land in the varnish-dev deb and the
    varnish-devel RPM:
    
        $ rpm --query --package --list varnish-trunk-1.el7.x86_64.rpm |
        > grep cache_varnishd.h
    
        $ rpm --query --package --list varnish-devel-trunk-1.el7.x86_64.rpm |
        > grep cache_varnishd.h
        /usr/include/varnish/cache/cache_varnishd.h
    
    You will have to trust me for the Debs as it's a bit cumbersome for me to
    build them locally.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 452d044..a033001 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -124,9 +124,7 @@ noinst_HEADERS = \
 	cache/cache_pool.h \
 	cache/cache_tcp_pool.h \
 	cache/cache_transport.h \
-	cache/cache_varnishd.h \
 	cache/cache_vgz.h \
-	common/common_param.h \
 	common/heritage.h \
 	common/vsmw.h \
 	hash/hash_slinger.h \
@@ -147,6 +145,8 @@ nobase_pkginclude_HEADERS = \
 	cache/cache_backend.h \
 	cache/cache_director.h \
 	cache/cache_filter.h \
+	cache/cache_varnishd.h \
+	common/common_param.h \
 	waiter/waiter.h
 
 vcldir=$(datarootdir)/$(PACKAGE)/vcl


More information about the varnish-commit mailing list