Workaround for a breaking change in GNU make 4.3.

dpkg/dcs-classifier/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-blobdigest/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-blobsynth/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-dispatch/debian/rules

@@ -5,12 +5,21 @@ DPKG_EXPORT_BUILDFLAGS=1
 
 include /usr/share/dpkg/pkg-info.mk
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-dns/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./bootstrap

dpkg/libvmod-dynamic/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-geoip2/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-hoailona/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-re/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/libvmod-uuid/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/template_vmod/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh

dpkg/varnish-modules/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./bootstrap

dpkg/varnish/debian/rules

 #!/usr/bin/make -f
 
 DH_VERBOSE=1
+
 DPKG_EXPORT_BUILDFLAGS=1
 
 include /usr/share/dpkg/pkg-info.mk
@@ -20,12 +21,21 @@ ifneq ($(filter $(DEB_HOST_ARCH),$(DISABLE_JEMALLOC_ARCH_LIST)),)
 LOCAL_CONFIGURE_FLAGS += --disable-jemalloc
 endif
 
-VMOD_strictABI = $(shell printf '\#include "vcs_version.h"\nVCS_Version\n' \
-        | cpp - -Iinclude | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
-
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - -Iinclude \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+	   | cpp - -Iinclude \
+	   | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+		 | cpp - -Iinclude \
+		 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 # Main build rule, leave everything to debhelper
 %:

dpkg/varnishevent/debian/rules

@@ -2,12 +2,21 @@
 
 DH_VERBOSE=1
 
-VMOD_ABI = $(shell printf '\#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
-        | cpp - $(shell pkg-config --cflags varnishapi) \
-        | sed -e '/^"/!d' -e 's/\"//g' -e 's/^.* /varnishabi-strict-/')
+# Workaround for a breaking change in GNU make 4.3.
+H := \#
+
+# Extract VMOD_ABI version, this is used for building vmods using the official
+# VMOD API
+VMOD_ABI = $(shell printf '$(H)include "vdef.h"\n$(H)include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
+           | cpp - -Iinclude \
+           | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g')
+
+# Extract VMOD_strictABI, which refers to the exact build of varnish. This is
+# used for old style vmods bypassing the VMOD API, accessing the internal data
+# structures directly.
+VMOD_strictABI = $(shell printf '$(H)include "vcs_version.h"\nVCS_Version\n' \
+                 | cpp - -Iinclude \
+                 | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/')
 
 override_dh_auto_configure:
 	./autogen.sh