From e7edbc708d4f43215bbe37ae600bbfc6a8b9344f Mon Sep 17 00:00:00 2001 From: Ben Tovar Date: Wed, 18 Mar 2020 09:37:39 -0400 Subject: [PATCH] Bump to 7.1.1 --- chirp/src/Makefile | 4 ++-- configure | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chirp/src/Makefile b/chirp/src/Makefile index 80d8d14a56..ffabafd483 100644 --- a/chirp/src/Makefile +++ b/chirp/src/Makefile @@ -4,10 +4,10 @@ include ../../rules.mk # -DSQLITE_DEFAULT_MMAP_SIZE=1073741824 - allow mmap of database. # -DSQLITE_TEMP_STORE=3 - only use memory for temporary files. # -DSQLITE_THREADSAFE=0 - we only use sqlite3 multi-process (i.e. no threads). This disables somewhat costly mutex locks. -LOCAL_CCFLAGS = -DSQLITE_DEFAULT_MMAP_SIZE=1073741824 -DSQLITE_TEMP_STORE=3 -DSQLITE_THREADSAFE=0 -fstack-protector-all +LOCAL_CCFLAGS = -DSQLITE_DEFAULT_MMAP_SIZE=1073741824 -DSQLITE_TEMP_STORE=3 -DSQLITE_THREADSAFE=0 -fstack-protector-all $(CCTOOLS_GLOBUS_CCFLAGS) # Globus is needed by all executables via libdttools.a/auth_globus.o -LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS) +LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS) $(CCTOOLS_READLINE_LDFLAGS) EXTERNAL_DEPENDENCIES = ../../dttools/src/libdttools.a LIBRARIES = libchirp.a libconfuga.a diff --git a/configure b/configure index e4a6f708c0..bf1ce26120 100755 --- a/configure +++ b/configure @@ -5,7 +5,7 @@ MAJOR=7 MINOR=1 -MICRO=0 +MICRO=1 # Optionally set the source/tag for this code (e.g. RC1 or FINAL). Setting # this variable is instead useful for statically naming the source when it will