Merge in default ENGINE-237
authorDamiano Boppart <damiano@pep-security.net>
Mon, 28 Aug 2017 14:35:16 +0200
branchENGINE-237
changeset 20097da0d79c6141
parent 2008 f93bf1fac875
parent 2007 2149f36880b6
child 2014 4b6659d17b61
Merge in default
     1.1 --- a/build-config/Linux.conf	Mon Aug 28 14:32:46 2017 +0200
     1.2 +++ b/build-config/Linux.conf	Mon Aug 28 14:35:16 2017 +0200
     1.3 @@ -19,8 +19,8 @@
     1.4  else
     1.5      CFLAGS+= -O3 -DNDEBUG
     1.6  endif
     1.7 -# '-Wno-cpp' is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file.
     1.8 -CFLAGS_GENERATED=-Wno-cpp
     1.9 +# The '_DEFAULT_SOURCE' feature test macro is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file. It's a glibc specific warning, only present in few versions around ~2.19. See https://lwn.net/Articles/590381/ for a discussion.
    1.10 +CFLAGS_GENERATED=-D_DEFAULT_SOURCE
    1.11  
    1.12  ######### C++ #########
    1.13  CXX=g++ -std=gnu++11 -pthread
     2.1 --- a/src/Makefile	Mon Aug 28 14:32:46 2017 +0200
     2.2 +++ b/src/Makefile	Mon Aug 28 14:35:16 2017 +0200
     2.3 @@ -13,8 +13,7 @@
     2.4  ifeq ($(BUILD_ON),Darwin)
     2.5      ifeq ($(BUILD_FOR),Darwin)
     2.6          CFLAGS+= -DSQLITE_THREADSAFE=1
     2.7 -        #LDFLAGS+= -L/opt/local/lib
     2.8 -        LDLIBS+= -lsqlite3 -lz -liconv
     2.9 +        LDLIBS+= -lz -liconv
    2.10      else
    2.11          $(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
    2.12      endif
    2.13 @@ -32,6 +31,7 @@
    2.14  ifdef SQLITE3_FROM_OS
    2.15      NO_SOURCE+= sqlite3.c
    2.16      CFLAGS+= -DSQLITE3_FROM_OS
    2.17 +    LDLIBS+= -lsqlite3
    2.18  endif
    2.19  
    2.20  ifeq ($(OPENPGP),GPG)
     3.1 --- a/test/Makefile	Mon Aug 28 14:32:46 2017 +0200
     3.2 +++ b/test/Makefile	Mon Aug 28 14:35:16 2017 +0200
     3.3 @@ -24,6 +24,10 @@
     3.4      LDLIBS+= -lnetpgp
     3.5  endif
     3.6  
     3.7 +ifdef SQLITE3_FROM_OS
     3.8 +    LDLIBS+= -lsqlite3
     3.9 +endif
    3.10 +
    3.11  ifeq ($(shell uname),Darwin)
    3.12      LIBPATH=DYLD_LIBRARY_PATH
    3.13      LLDB_BIN=/Applications/Xcode.app/Contents/Developer/usr/bin/lldb