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. sync Release_2.0.5
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 11 May 2020 10:38:13 +0200
branchsync
changeset 47013db667f48863
parent 4686 fd809e5826c2
child 4702 2ccf22fa5d04
child 4748 85cfc14aaa20
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
     1.1 --- a/Makefile.conf	Fri May 08 02:57:23 2020 +0200
     1.2 +++ b/Makefile.conf	Mon May 11 10:38:13 2020 +0200
     1.3 @@ -305,13 +305,24 @@
     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 -    SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
    1.12 -    SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
    1.13 -    SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
    1.14 -    SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
    1.15 -    CFLAGS+= $(SEQUOIA_CFLAGS)
    1.16 -    LD_FLAGS+= $(SEQUOIA_LDFLAGS)
    1.17 +ifeq ($(SEQUOIA_CFLAGS),)
    1.18 +     SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
    1.19 +endif
    1.20 +ifeq ($(SEQUOIA_LDFLAGS),)
    1.21 +     SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
    1.22 +endif
    1.23 +ifeq ($(SEQUOIA_LIB),)
    1.24 +     SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
    1.25 +endif
    1.26 +ifeq ($(SEQUOIA_INC),)
    1.27 +     SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
    1.28 +endif
    1.29 +     CFLAGS+= $(SEQUOIA_CFLAGS)
    1.30 +     LD_FLAGS+= $(SEQUOIA_LDFLAGS)
    1.31  endif
    1.32  
    1.33  # YML_PATH is needed in the environment of every call to a program of the YML2 distribution