[master] fc4c27f Replace method for extracting gitref.
Lasse Karstensen
lkarsten at varnish-software.com
Thu Nov 27 19:02:39 CET 2014
commit fc4c27f04f98508497ab80092bb4b21772604086
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date: Thu Nov 27 19:01:53 2014 +0100
Replace method for extracting gitref.
That sed line got unruly real quick when trying to
escape it correctly.
diff --git a/rules b/rules
index f3c65a4..20e921b 100755
--- a/rules
+++ b/rules
@@ -18,9 +18,8 @@ ifneq ($(filter $(DEB_HOST_ARCH),$(DISABLE_JEMALLOC_ARCH_LIST)),)
LOCAL_CONFIGURE_FLAGS += --disable-jemalloc
endif
-VMOD_strictABI = $(shell printf '\#include "vmod_abi.h"\nVMOD_ABI_Version\n' \
- | cpp - -Iinclude \
- | sed -e '/"Varnish/!d' -e 's/.*\ \(.*\)\"$/varnishabi-strict-\1/')
+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 \
More information about the varnish-commit
mailing list