Merge ENGINE-261
authorDamiano Boppart <damiano@pep-security.net>
Thu, 21 Sep 2017 16:42:50 +0200
changeset 20886e0756ac5b2a
parent 2076 2aadece6fcf4
parent 2087 b78cf1185fe4
child 2089 174f5577c0aa
child 2090 d32a42588565
Merge ENGINE-261
build-config/Darwin.conf
build-config/Linux.conf
build-config/common.conf
     1.1 --- a/.hgignore	Tue Sep 19 15:02:12 2017 +0200
     1.2 +++ b/.hgignore	Thu Sep 21 16:42:50 2017 +0200
     1.3 @@ -4,6 +4,7 @@
     1.4  ^asn\.1/libasn1\.a$
     1.5  .*xcuserdata/
     1.6  ^build/
     1.7 +^local.conf
     1.8  
     1.9  syntax: glob
    1.10  *.orig
     2.1 --- a/Makefile	Tue Sep 19 15:02:12 2017 +0200
     2.2 +++ b/Makefile	Thu Sep 21 16:42:50 2017 +0200
     2.3 @@ -11,7 +11,7 @@
     2.4  export YML_PATH=$(YML2_PATH)
     2.5  
     2.6  .PHONY: all
     2.7 -all: _platform_override_info
     2.8 +all: _override_info
     2.9  	$(MAKE) -C asn.1 generate
    2.10  	$(MAKE) -C asn.1
    2.11  	$(MAKE) -C sync
    2.12 @@ -23,12 +23,12 @@
    2.13  	$(MAKE) -C asn.1 install
    2.14  
    2.15  .PHONY: uninstall
    2.16 -uninstall:
    2.17 +uninstall: _override_info
    2.18  	$(MAKE) -C src uninstall
    2.19  	$(MAKE) -C asn.1 uninstall
    2.20  
    2.21  .PHONY: clean
    2.22 -clean:
    2.23 +clean: _override_info
    2.24  	$(MAKE) -C src clean
    2.25  	$(MAKE) -C test clean
    2.26  	$(MAKE) -C db clean
    2.27 @@ -49,15 +49,24 @@
    2.28  	cd .. ; COPYFILE_DISABLE=true tar cjf pEpEngine.tar.bz2 "$(HERE_REL)"
    2.29  
    2.30  .PHONY: db
    2.31 -db:
    2.32 +db: _override_info
    2.33  	$(MAKE) -C db db
    2.34  
    2.35 -.PHONY: _platform_override
    2.36 -ifdef PLATFORM_OVERRIDE
    2.37 -_platform_override_info:
    2.38 +.PHONY: _override_info
    2.39 +_override_info: _local_conf_info _build_config_info
    2.40 +
    2.41 +.PHONY: _local_conf_info
    2.42 +_local_conf_info:
    2.43 +ifneq ($(wildcard local.conf),)
    2.44 +	@echo "================================================"
    2.45 +	@echo "Overrides in \`local.conf\` are used."
    2.46  	@echo "================================================"
    2.47 -	@echo "PLATFORM_OVERRIDE is set to '$(PLATFORM_OVERRIDE)'."
    2.48 +endif
    2.49 +
    2.50 +.PHONY: _build_config_info
    2.51 +_build_config_info:
    2.52 +ifdef BUILD_CONFIG
    2.53  	@echo "================================================"
    2.54 -else
    2.55 -_platform_override_info:
    2.56 +	@echo "Overrides in \`$(BUILD_CONFIG)\` are used."
    2.57 +	@echo "================================================"
    2.58  endif
     3.1 --- a/Makefile.conf	Tue Sep 19 15:02:12 2017 +0200
     3.2 +++ b/Makefile.conf	Thu Sep 21 16:42:50 2017 +0200
     3.3 @@ -3,22 +3,250 @@
     3.4  # This file may be used under the terms of the GNU General Public License version 3
     3.5  # see LICENSE.txt
     3.6  
     3.7 -# This file assembles all the make variables that a maintainer or dev may want to adapt for a distribution.
     3.8 +# This file gives an overview over all the parameters that can be easily customized for a build.
     3.9 +# There are three ways in which you can customize your build:
    3.10 +# 1) Edit the variable assignments in this file
    3.11 +# 2) Create `local.conf` and fill it with variable assignments.
    3.12 +#    These `local.conf` takes precedence over the assignments below.
    3.13 +# 3) Set the environment variable `BUILD_CONFIG` to an absolute path.
    3.14 +#    The variable assignments found at the path indicated by `BUILD_CONFIG` take precedence over the assignments below and the assignments in `local.conf`.
    3.15 +# If nothing is changed according to these 3 methods, a default configuration for your platform will be used for the build.
    3.16 +
    3.17 +HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
    3.18  
    3.19 -# To use custom build configuration variables, put them in a new file with the path `build-config/<name>.conf`.
    3.20 -# Execute `export PLATFORM_OVERRIDE=<name>` before running make.
    3.21 -# If this environment variable is not set, make will load a default configuration for your platform.
    3.22 +######### General #########
    3.23 +# To use (only) system libraries, set all the *_INC and *_LIB variables to the empty string.
    3.24 +# All the *_INC and *_LIB variables are command line flags, not paths.
    3.25 +# Thus, all *_INC variables' values must start with "-I", and all *_LIB variables' values must start with "-L".
    3.26  
    3.27 -BUILD_CONFIG:=$(dir $(lastword $(MAKEFILE_LIST)))build-config
    3.28 +BUILD_ON:=$(shell uname)
    3.29  
    3.30 -include $(BUILD_CONFIG)/common.conf
    3.31 +# This variable specifies the platform that the engine should be cross-compiled for.
    3.32 +BUILD_FOR=$(BUILD_ON)
    3.33 +
    3.34  # Cross-compiling is currently not supported.
    3.35 -# Maybe you can hack something with `PLATFORM_OVERRIDE`
    3.36 -ifeq ($(BUILD_ON),$(BUILD_FOR))
    3.37 -    include $(BUILD_CONFIG)/$(BUILD_ON).conf
    3.38 -else
    3.39 -    $(error I don't know how to build for $(BUILD_FOR) on $(BUILD_ON))
    3.40 +# Maybe you can hack something with `local.conf`.
    3.41 +ifneq ($(BUILD_ON),$(BUILD_FOR))
    3.42 +    $(error I don't know how to build for $(BUILD_FOR) on $(BUILD_ON).)
    3.43 +endif
    3.44 +
    3.45 +# Installation path prefix for libraries and binaries, except for system.db
    3.46 +PREFIX=$(HOME)
    3.47 +
    3.48 +# Installation path for system.db
    3.49 +SYSTEM_DB=/usr/local/share/pEp/system.db
    3.50 +
    3.51 +# Filename of the pEpEngine library
    3.52 +ifeq ($(BUILD_FOR),Linux)
    3.53 +    TARGET=libpEpEngine.so
    3.54 +else ifeq ($(BUILD_FOR),Darwin)
    3.55 +    TARGET=libpEpEngine.dylib
    3.56 +endif
    3.57 +
    3.58 +# If empty, create a release build.
    3.59 +# Otherwise, create a debug build.
    3.60 +# This variable is ineffective in your override.conf file.
    3.61 +DEBUG=
    3.62 +
    3.63 +# If empty, suppress compiler warnings.
    3.64 +# Otherwise, print warnings.
    3.65 +# This variable is ineffective in your override.conf file.
    3.66 +WARN=placeholder
    3.67 +
    3.68 +
    3.69 +######### C and C++ #########
    3.70 +TARGET_ARCH=
    3.71 +# The following two variables will be appended to.
    3.72 +# You can thus not set them to a fixed value here.
    3.73 +ifeq ($(BUILD_FOR),Linux)
    3.74 +    LDFLAGS=
    3.75 +else ifeq ($(BUILD_FOR),Darwin)
    3.76 +    # "-bind_at_load" helps find symbol resolution errors faster
    3.77 +    LDFLAGS=-bind_at_load
    3.78 +endif
    3.79 +
    3.80 +LDLIBS=
    3.81 +
    3.82 +
    3.83 +######### C #########
    3.84 +ifeq ($(BUILD_FOR),Linux)
    3.85 +    CC=gcc -std=c99 -pthread
    3.86 +else ifeq ($(BUILD_FOR),Darwin)
    3.87 +    # clang issues a warning when "-pthread" is used for linking.
    3.88 +    # So, include it in CFLAGS, and not in CC
    3.89 +    CC=clang -std=c99
    3.90 +endif
    3.91 +
    3.92 +ifeq ($(BUILD_FOR),Linux)
    3.93 +    CFLAGS=-fPIC -fstrict-aliasing -fdiagnostics-color=always
    3.94 +else ifeq ($(BUILD_FOR),Darwin)
    3.95 +    CFLAGS=-pthread -fPIC -fstrict-aliasing -fcolor-diagnostics
    3.96 +endif
    3.97 +
    3.98 +CPPFLAGS=
    3.99 +
   3.100 +# The flag -DNDEBUG will always be removed from CFLAGS for compiling tests.
   3.101 +# The tests do not work properly, if compiled with -DNDEBUG
   3.102 +ifeq ($(BUILD_FOR),Linux)
   3.103 +    ifdef WARN
   3.104 +        CFLAGS+= -Wall -pedantic -Wstrict-aliasing=3
   3.105 +    else
   3.106 +        CFLAGS+= -w
   3.107 +    endif
   3.108 +    ifdef DEBUG
   3.109 +        CFLAGS+= -Og -ggdb -DDEBUG_ERRORSTACK
   3.110 +    else
   3.111 +        CFLAGS+= -O3 -DNDEBUG
   3.112 +    endif
   3.113 +else ifeq ($(BUILD_FOR),Darwin)    
   3.114 +    ifdef WARN
   3.115 +        # FIXME Remove 'no-extended-offsetof' after ENGINE-236 is closed.
   3.116 +        CFLAGS+= -Wall -pedantic -Wno-extended-offsetof
   3.117 +    else
   3.118 +        CFLAGS+= -w
   3.119 +    endif
   3.120 +    ifdef DEBUG
   3.121 +        CFLAGS+= -O0 -g -DDEBUG_ERRORSTACK
   3.122 +    else
   3.123 +        CFLAGS+= -O3 -DNDEBUG
   3.124 +    endif
   3.125 +endif
   3.126 +
   3.127 +# Additional CFLAGS used for compiling ASN1C-generated code
   3.128 +ifeq ($(BUILD_FOR),Linux)
   3.129 +    # The '_DEFAULT_SOURCE' feature test macro is required to suppress the warning
   3.130 +    #   _BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE
   3.131 +    # otherwise printed during the compilation of every asn1c-generated C file.
   3.132 +    # It's a glibc specific warning, only present in few versions around ~2.19.
   3.133 +    # See https://lwn.net/Articles/590381/ for a discussion.
   3.134 +    CFLAGS_GENERATED=-D_DEFAULT_SOURCE
   3.135 +else ifeq ($(BUILD_FOR),Darwin)
   3.136 +    CFLAGS_GENERATED=
   3.137 +endif
   3.138 +
   3.139 +
   3.140 +######### C++ #########
   3.141 +ifeq ($(BUILD_FOR),Linux)
   3.142 +    CXX=g++ -std=gnu++11 -pthread
   3.143 +else ifeq ($(BUILD_FOR),Darwin)
   3.144 +    # clang issues a warning when "-pthread" is used for linking. So, include it in CXXFLAGS, and not in CXX
   3.145 +    CXX=clang -std=c++11
   3.146  endif
   3.147 -ifdef PLATFORM_OVERRIDE
   3.148 -    include $(BUILD_CONFIG)/$(PLATFORM_OVERRIDE).conf
   3.149 +
   3.150 +# The flag -DNDEBUG will always be removed from CXXFLAGS for compiling tests.
   3.151 +# The tests do not work properly, if compiled with -DNDEBUG
   3.152 +ifeq ($(BUILD_FOR),Linux)
   3.153 +    CXXFLAGS=-fdiagnostics-color=always -I../src -I../asn.1 $(ETPAN_INC)
   3.154 +    ifdef WARN
   3.155 +        CXXFLAGS+=
   3.156 +    else
   3.157 +        CXXFLAGS+= -w
   3.158 +    endif
   3.159 +    ifdef DEBUG
   3.160 +        CXXFLAGS+= -Og -ggdb
   3.161 +    else
   3.162 +        CXXFLAGS+= -O3 -DNDEBUG
   3.163 +    endif
   3.164 +else ifeq ($(BUILD_FOR),Darwin)
   3.165 +    CXXFLAGS=-pthread -fcolor-diagnostics -I../src -I../asn.1 $(ETPAN_INC)
   3.166 +    ifdef WARN
   3.167 +        CXXFLAGS+=
   3.168 +    else
   3.169 +        CXXFLAGS+= -w
   3.170 +    endif
   3.171 +    ifdef DEBUG
   3.172 +        CXXFLAGS+= -O0 -g
   3.173 +    else
   3.174 +        CXXFLAGS+= -O3 -DNDEBUG
   3.175 +    endif
   3.176  endif
   3.177 +
   3.178 +
   3.179 +######### YML2 #########
   3.180 +YML2_PATH=$(HOME)/yml2
   3.181 +
   3.182 +YML2_PROC=$(YML2_PATH)/yml2proc
   3.183 +
   3.184 +YML2_OPTS=--encoding=utf8
   3.185 +
   3.186 +
   3.187 +######### asn1c #########
   3.188 +# asn1c binary
   3.189 +ASN1C=asn1c
   3.190 +
   3.191 +# asn1c include search flag
   3.192 +ASN1C_INC=
   3.193 +#ASN1C_INC=-I$(HOME)/include
   3.194 +
   3.195 +
   3.196 +######### libetpan #########
   3.197 +# libetpan library search flag
   3.198 +ETPAN_LIB=-L$(PREFIX)/lib
   3.199 +
   3.200 +# libetpan include search flag
   3.201 +ETPAN_INC=-I$(PREFIX)/include
   3.202 +
   3.203 +
   3.204 +######### sqlite3 #########
   3.205 +# If empty (or undefined), compile sqlite3 from the sources shipped with the pEp distribution.
   3.206 +# Otherwise, use an sqlite3 implementation found in the OS's include/library paths.
   3.207 +SQLITE3_FROM_OS=placeholder
   3.208 +
   3.209 +
   3.210 +######### OpenPGP #########
   3.211 +# Path of GPG binary
   3.212 +GPG_CMD:=$(shell gpgconf --list-components | awk -F: '/^gpg:/ { print $$3; exit 0; }')
   3.213 +
   3.214 +# Selects OpenPGP implementation. must be either `GPG` or `NETPGP`
   3.215 +OPENPGP=GPG
   3.216 +
   3.217 +# Path of libGPGME binary
   3.218 +ifeq ($(BUILD_FOR),Linux)
   3.219 +    LIBGPGME=libgpgme.so.11
   3.220 +else ifeq ($(BUILD_FOR),Darwin)
   3.221 +    LIBGPGME=libgpgme.dylib
   3.222 +endif
   3.223 +
   3.224 +# libGPGME library search flag
   3.225 +ifeq ($(BUILD_FOR),Linux)
   3.226 +    GPGME_LIB=
   3.227 +else ifeq ($(BUILD_FOR),Darwin)
   3.228 +    GPGME_LIB=-L$(HOME)/lib
   3.229 +endif
   3.230 +
   3.231 +# libGPGME include search flag
   3.232 +ifeq ($(BUILD_FOR),Linux)
   3.233 +    GPGME_INC=
   3.234 +else ifeq ($(BUILD_FOR),Darwin)
   3.235 +    GPGME_INC=-I$(HOME)/include
   3.236 +endif
   3.237 +
   3.238 +# NETPGP library search flag
   3.239 +NETPGP_LIB=
   3.240 +#NETPGP_LIB=-L$(PREFIX)/lib
   3.241 +
   3.242 +# libGPGME include search flag
   3.243 +NETPGP_INC=
   3.244 +#NETPGP_INC=-I$(PREFIX)/include
   3.245 +
   3.246 +
   3.247 +######### Engine internals #########
   3.248 +# C macros (not environment variables) that can be overridden:
   3.249 +# DEFAULT_KEYSERVER - string with default keyserver
   3.250 +# CRASHDUMP_DEFAULT_LINES - number of log lines to deliver for crashdumps
   3.251 +# Example:
   3.252 +#    EXTRA_MACROS=-DDEFAULT_KEYSERVER=\"default-server.org\" -DCRASHDUMP_DEFAULT_LINES=23
   3.253 +EXTRA_MACROS=
   3.254 +
   3.255 +
   3.256 +######### Misc #########
   3.257 +# FIXME Maybe include these variables here.
   3.258 +# Check how they are used throughout the project before setting them here
   3.259 +#LLDB_BIN
   3.260 +
   3.261 +
   3.262 +-include $(HERE)/local.conf
   3.263 +
   3.264 +ifdef BUILD_CONFIG
   3.265 +    -include $(BUILD_CONFIG)
   3.266 +endif
     4.1 --- a/build-config/Darwin.conf	Tue Sep 19 15:02:12 2017 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,58 +0,0 @@
     4.4 -# Copyright 2017, pEp Foundation
     4.5 -# This file is part of pEpEngine
     4.6 -# This file may be used under the terms of the GNU General Public License version 3
     4.7 -# see LICENSE.txt
     4.8 -
     4.9 -######### General #########
    4.10 -TARGET=libpEpEngine.dylib
    4.11 -
    4.12 -######### C #########
    4.13 -# clang issues a warning when "-pthread" is used for linking. So, include it in CFLAGS, and not in CC
    4.14 -CC=clang -std=c99
    4.15 -CFLAGS=-pthread -fPIC -fstrict-aliasing -fcolor-diagnostics
    4.16 -ifdef WARN
    4.17 -    # FIXME Remove 'no-extended-offsetof' after ENGINE-236 is closed.
    4.18 -    CFLAGS+= -Wall -pedantic -Wno-extended-offsetof
    4.19 -else
    4.20 -    CFLAGS+= -w
    4.21 -endif
    4.22 -ifdef DEBUG
    4.23 -    CFLAGS+= -O0 -g -DDEBUG_ERRORSTACK
    4.24 -else
    4.25 -    CFLAGS+= -O3 -DNDEBUG
    4.26 -endif
    4.27 -CFLAGS_GENERATED=
    4.28 -
    4.29 -######### C++ #########
    4.30 -# clang issues a warning when "-pthread" is used for linking. So, include it in CXXFLAGS, and not in CXX
    4.31 -CXX=clang -std=c++11
    4.32 -CXXFLAGS=-pthread -fcolor-diagnostics -I../src -I../asn.1 $(ETPAN_INC)
    4.33 -ifdef WARN
    4.34 -    CXXFLAGS+=
    4.35 -else
    4.36 -    CXXFLAGS+= -w
    4.37 -endif
    4.38 -ifdef DEBUG
    4.39 -    CXXFLAGS+= -O0 -g
    4.40 -else
    4.41 -    CXXFLAGS+= -O3 -DNDEBUG
    4.42 -endif
    4.43 -
    4.44 -######### C and C++ #########
    4.45 -# "-bind_at_load" helps find symbol resolution errors faster
    4.46 -LDFLAGS=-bind_at_load
    4.47 -
    4.48 -######### YML2 #########
    4.49 -
    4.50 -######### asn1c #########
    4.51 -
    4.52 -######### libetpan #########
    4.53 -
    4.54 -######### OpenPGP #########
    4.55 -LIBGPGME=libgpgme.dylib
    4.56 -GPGME_LIB=-L$(HOME)/lib
    4.57 -GPGME_INC=-I$(HOME)/include
    4.58 -
    4.59 -######### Engine internals #########
    4.60 -
    4.61 -######### Misc #########
     5.1 --- a/build-config/Linux.conf	Tue Sep 19 15:02:12 2017 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,55 +0,0 @@
     5.4 -# Copyright 2017, pEp Foundation
     5.5 -# This file is part of pEpEngine
     5.6 -# This file may be used under the terms of the GNU General Public License version 3
     5.7 -# see LICENSE.txt
     5.8 -
     5.9 -######### General #########
    5.10 -TARGET=libpEpEngine.so
    5.11 -
    5.12 -######### C #########
    5.13 -CC=gcc -std=c99 -pthread
    5.14 -CFLAGS=-fPIC -fstrict-aliasing -fdiagnostics-color=always
    5.15 -ifdef WARN
    5.16 -    CFLAGS+= -Wall -pedantic -Wstrict-aliasing=3
    5.17 -else
    5.18 -    CFLAGS+= -w
    5.19 -endif
    5.20 -ifdef DEBUG
    5.21 -    CFLAGS+= -Og -ggdb -DDEBUG_ERRORSTACK
    5.22 -else
    5.23 -    CFLAGS+= -O3 -DNDEBUG
    5.24 -endif
    5.25 -# 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.
    5.26 -CFLAGS_GENERATED=-D_DEFAULT_SOURCE
    5.27 -
    5.28 -######### C++ #########
    5.29 -CXX=g++ -std=gnu++11 -pthread
    5.30 -CXXFLAGS=-fdiagnostics-color=always -I../src -I../asn.1 $(ETPAN_INC)
    5.31 -ifdef WARN
    5.32 -    CXXFLAGS+=
    5.33 -else
    5.34 -    CXXFLAGS+= -w
    5.35 -endif
    5.36 -ifdef DEBUG
    5.37 -    CXXFLAGS+= -Og -ggdb
    5.38 -else
    5.39 -    CXXFLAGS+= -O3 -DNDEBUG
    5.40 -endif
    5.41 -
    5.42 -######### C and C++ #########
    5.43 -LDFLAGS=
    5.44 -
    5.45 -######### YML2 #########
    5.46 -
    5.47 -######### asn1c #########
    5.48 -
    5.49 -######### libetpan #########
    5.50 -
    5.51 -######### OpenPGP #########
    5.52 -LIBGPGME=libgpgme.so.11
    5.53 -GPGME_LIB=
    5.54 -GPGME_INC=
    5.55 -
    5.56 -######### Engine internals #########
    5.57 -
    5.58 -######### Misc #########
     6.1 --- a/build-config/common.conf	Tue Sep 19 15:02:12 2017 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,101 +0,0 @@
     6.4 -# Copyright 2017, pEp Foundation
     6.5 -# This file is part of pEpEngine
     6.6 -# This file may be used under the terms of the GNU General Public License version 3
     6.7 -# see LICENSE.txt
     6.8 -
     6.9 -# General remark: to use (only) system libraries, set all the *_INC and *_LIB variables to the empty string.
    6.10 -# All the *_INC and *_LIB variables are command line flags, not paths.
    6.11 -# Thus, all *_INC variables' values must start with "-I", and all *_LIB variables' values must start with "-L".
    6.12 -
    6.13 -######### General #########
    6.14 -BUILD_ON:=$(shell uname)
    6.15 -# This variable specifies the platform that the engine should be cross-compiled for.
    6.16 -BUILD_FOR=$(BUILD_ON)
    6.17 -# Installation path prefix for libraries and binaries, except for system.db
    6.18 -PREFIX=$(HOME)
    6.19 -# Installation path for system.db
    6.20 -SYSTEM_DB=/usr/local/share/pEp/system.db
    6.21 -# Filename of the pEpEngine library
    6.22 -#TARGET This option is platform-specific
    6.23 -# If not empty, create a debug build.
    6.24 -# This variable is ineffective in your PLATFORM_OVERRIDE.conf file.
    6.25 -DEBUG=
    6.26 -# If not empty, print compiler warnings.
    6.27 -# This variable is ineffective in your PLATFORM_OVERRIDE.conf file.
    6.28 -WARN=placeholder
    6.29 -
    6.30 -######### C #########
    6.31 -#CC This option is platform-specific
    6.32 -CPPFLAGS=
    6.33 -# The flag -DNDEBUG will always be removed from CFLAGS for compiling tests.
    6.34 -# The tests do not work properly, if compiled with -DNDEBUG
    6.35 -#CFLAGS This option is platform-specific
    6.36 -# Additional CFLAGS used for compiling ASN1C-generated code
    6.37 -#CFLAGS_GENERATED This option is platform-specific
    6.38 -
    6.39 -######### C++ #########
    6.40 -#CXX This option is platform-specific
    6.41 -# The flag -DNDEBUG will always be removed from CXXFLAGS for compiling tests.
    6.42 -# The tests do not work properly, if compiled with -DNDEBUG
    6.43 -#CXXFLAGS This option is platform-specific
    6.44 -
    6.45 -######### C and C++ #########
    6.46 -TARGET_ARCH=
    6.47 -# The following two variables will be appended to.
    6.48 -# You can thus not set them to a fixed value here.
    6.49 -#LDFLAGS= This option is platform-specific
    6.50 -LDLIBS=
    6.51 -
    6.52 -######### YML2 #########
    6.53 -YML2_PATH=$(HOME)/yml2
    6.54 -YML2_PROC=$(YML2_PATH)/yml2proc
    6.55 -YML2_OPTS=--encoding=utf8
    6.56 -
    6.57 -######### asn1c #########
    6.58 -# asn1c binary
    6.59 -ASN1C=asn1c
    6.60 -# asn1c include search flag
    6.61 -ASN1C_INC=
    6.62 -#ASN1C_INC=-I$(HOME)/include
    6.63 -
    6.64 -######### libetpan #########
    6.65 -# libetpan library search flag
    6.66 -ETPAN_LIB=-L$(PREFIX)/lib
    6.67 -# libetpan include search flag
    6.68 -ETPAN_INC=-I$(PREFIX)/include
    6.69 -
    6.70 -######### sqlite3 #########
    6.71 -# If empty (or undefined), compile sqlite3 from the sources shipped with the pEp distribution.
    6.72 -# Otherwise, use an sqlite3 implementation found in the OS's include/library paths.
    6.73 -SQLITE3_FROM_OS=placeholder
    6.74 -
    6.75 -######### OpenPGP #########
    6.76 -# Path of GPG binary
    6.77 -GPG_CMD:=$(shell gpgconf --list-components | awk -F: '/^gpg:/ { print $$3; exit 0; }')
    6.78 -# Selects OpenPGP implementation. must be either `GPG` or `NETPGP`
    6.79 -OPENPGP=GPG
    6.80 -# Path of libGPGME binary
    6.81 -#LIBGPGME This option is platform-specific
    6.82 -# libGPGME library search flag
    6.83 -#GPGME_LIB= This option is platform-specific
    6.84 -# libGPGME include search flag
    6.85 -#GPGME_INC= This option is platform-specific
    6.86 -# NETPGP library search flag
    6.87 -NETPGP_LIB=
    6.88 -#NETPGP_LIB=-L$(PREFIX)/lib
    6.89 -# libGPGME include search flag
    6.90 -NETPGP_INC=
    6.91 -#NETPGP_INC=-I$(PREFIX)/include
    6.92 -
    6.93 -######### Engine internals #########
    6.94 -# C macros (not environment variables) that can be overridden:
    6.95 -# DEFAULT_KEYSERVER - string with default keyserver
    6.96 -# CRASHDUMP_DEFAULT_LINES - number of log lines to deliver for crashdumps
    6.97 -# Example:
    6.98 -#    EXTRA_MACROS=-DDEFAULT_KEYSERVER=\"default-server.org\" -DCRASHDUMP_DEFAULT_LINES=23
    6.99 -EXTRA_MACROS=
   6.100 -
   6.101 -######### Misc #########
   6.102 -# FIXME Maybe include these variables here.
   6.103 -# Check how they are used throughout the project before setting them here
   6.104 -#LLDB_BIN
     7.1 --- a/doc/build-debian.md	Tue Sep 19 15:02:12 2017 +0200
     7.2 +++ b/doc/build-debian.md	Thu Sep 21 16:42:50 2017 +0200
     7.3 @@ -64,6 +64,8 @@
     7.4  mkdir ~/code/pep-engine/build
     7.5  ~~~
     7.6  
     7.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     7.8 +
     7.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    7.10  In this guide, the platform-specific configuration will be called `local`.
    7.11  The installation directory will be a subdirectory of the repository.
     8.1 --- a/doc/build-macos.md	Tue Sep 19 15:02:12 2017 +0200
     8.2 +++ b/doc/build-macos.md	Thu Sep 21 16:42:50 2017 +0200
     8.3 @@ -76,6 +76,8 @@
     8.4  mkdir ~/code/pep-engine/build
     8.5  ~~~
     8.6  
     8.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     8.8 +
     8.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    8.10  In this guide, the platform-specific configuration will be called `local`.
    8.11  The installation directory will be a subdirectory of the repository.