From e91123e17a6ebe2cb1f718aa3e44edb10b707779 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Thu, 24 Jan 2019 14:21:06 +0100 Subject: Use ChangeLog date instead of build date in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good. This date call works with GNU date and BSD date. Also use UTC/gmtime to be independent of timezone. --- configure.seed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.seed') diff --git a/configure.seed b/configure.seed index 1aa68f17c..006e6d976 100644 --- a/configure.seed +++ b/configure.seed @@ -30,7 +30,7 @@ if test -d ".git"; then : GIT_RELEASE="${PACKAGE_VERSION}-${GIT_NUM}-${GIT_TAG}" else GIT_RELEASE="${PACKAGE_VERSION}" - GIT_DATE=`date` + GIT_DATE=`date -u -r CHANGELOG.md` fi AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release]) -- cgit v1.2.3 From 518dbbc96bf759635cef4d6d37ad38d3d9fc5b51 Mon Sep 17 00:00:00 2001 From: chiehminw Date: Wed, 6 Mar 2019 15:21:13 +0800 Subject: Respect CXX variable during configure commit 6ac83ce7eb99 use CXX to link ndpiReader however CXX is not properly set in configure step Fixes: 6ac83ce7eb99 ("Fixes broken hyperscan compilation") Signed-off-by: chiehminw --- configure.seed | 1 + example/Makefile.in | 1 + 2 files changed, 2 insertions(+) (limited to 'configure.seed') diff --git a/configure.seed b/configure.seed index 1aa68f17c..6999ff78f 100644 --- a/configure.seed +++ b/configure.seed @@ -8,6 +8,7 @@ LT_INIT AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AX_PTHREAD NDPI_VERSION_SHORT="@NDPI_VERSION_SHORT@" diff --git a/example/Makefile.in b/example/Makefile.in index 8960ed0a2..ad75295cb 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -1,4 +1,5 @@ CC=@CC@ +CXX=@CXX@ CFLAGS=-g -I../src/include @CFLAGS@ LIBNDPI=../src/lib/libndpi.a LDFLAGS=$(LIBNDPI) @PCAP_LIB@ -lpthread @LDFLAGS@ -- cgit v1.2.3