From 3a4af874874ad623553ac061a771d428bce1e814 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Fri, 4 Nov 2016 21:44:19 +0100 Subject: [PATCH] Remove build date from banner for releases In support for reproducible builds, see https://wiki.debian.org/ReproducibleBuilds Fixes Debian bug #834316. Change-Id: Id81ec72a87bf6dd99abfd2a0ae074658111bc9a3 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/3866 Tested-by: jenkins Reviewed-by: Paul Fertser --- src/Makefile.am | 3 ++- src/openocd.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index fe403366a..bad4153a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ noinst_HEADERS = \ hello.h \ openocd.h -libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" +libopenocd_la_CPPFLAGS = # banner output includes RELSTR appended to $VERSION from the configure script # guess-rev.sh returns either a repository version ID or "-snapshot" @@ -48,6 +48,7 @@ libopenocd_la_CPPFLAGS += -DGITVERSION=\"\" else libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\" libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\" +libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\" endif # add default CPPFLAGS diff --git a/src/openocd.c b/src/openocd.c index b5bb44b33..94fab3a94 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -45,8 +45,13 @@ #include #endif +#ifdef PKGBLDDATE #define OPENOCD_VERSION \ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" +#else +#define OPENOCD_VERSION \ + "Open On-Chip Debugger " VERSION RELSTR +#endif static const char openocd_startup_tcl[] = { #include "startup_tcl.inc"