Don't call pkg-config if the sequoia vars are already set in local.conf - we should probably refactor this so local.conf comes afterward anyway. I don't understand damiano's reasoning here.
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 11 May 2020 10:35:17 +0200
changeset 47008d404d15701f
parent 4699 879f67f92b60
child 4704 a5cd7d6242e0
Don't call pkg-config if the sequoia vars are already set in local.conf - we should probably refactor this so local.conf comes afterward anyway. I don't understand damiano's reasoning here.
Makefile.conf
src/pEpEngine.h
     1.1 --- a/Makefile.conf	Mon May 11 10:33:36 2020 +0200
     1.2 +++ b/Makefile.conf	Mon May 11 10:35:17 2020 +0200
     1.3 @@ -266,11 +266,22 @@
     1.4  
     1.5  ######### Post processing assignments ########
     1.6  # These variables are ineffective when set anywhere else but here.
     1.7 +# KB: I have no idea why we do this - it totally defeats the purpose of
     1.8 +#     local.conf.
     1.9 +#     For now: set if has no value.
    1.10  ifeq ($(OPENPGP),SEQUOIA)
    1.11 +ifeq ($(SEQUOIA_CFLAGS),)
    1.12      SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
    1.13 +endif
    1.14 +ifeq ($(SEQUOIA_LDFLAGS),)
    1.15      SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
    1.16 +endif
    1.17 +ifeq ($(SEQUOIA_LIB),)
    1.18      SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
    1.19 +endif
    1.20 +ifeq ($(SEQUOIA_INC),)
    1.21      SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
    1.22 +endif
    1.23      CFLAGS+= $(SEQUOIA_CFLAGS)
    1.24      LD_FLAGS+= $(SEQUOIA_LDFLAGS)
    1.25  endif
     2.1 --- a/src/pEpEngine.h	Mon May 11 10:33:36 2020 +0200
     2.2 +++ b/src/pEpEngine.h	Mon May 11 10:35:17 2020 +0200
     2.3 @@ -27,7 +27,7 @@
     2.4  #define PEP_ENGINE_VERSION_MAJOR 2
     2.5  #define PEP_ENGINE_VERSION_MINOR 1
     2.6  #define PEP_ENGINE_VERSION_PATCH 0
     2.7 -#define PEP_ENGINE_VERSION_RC    0
     2.8 +#define PEP_ENGINE_VERSION_RC    1
     2.9  
    2.10  
    2.11  #define PEP_OWN_USERID "pEp_own_userId"