From 221908b41a590c339d58ec2a54a0575f9f4cb266 Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 2 Mar 2022 10:39:41 +0100 Subject: [PATCH 1/3] change Makefile again for Seq 1.7.0 and to remove wrong deployment info --- Makefile.conf | 8 ++++---- src/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.conf b/Makefile.conf index fd780ec8..349ff204 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -339,16 +339,16 @@ endif # Otherwise, add them to the CFLAGS/CXXFLAGS/LDFLAGS and library/include variables ifeq ($(OPENPGP),SEQUOIA) ifeq ($(SEQUOIA_CFLAGS),) - SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia-openpgp) -O2 + SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia) -O2 endif ifeq ($(SEQUOIA_LDFLAGS),) - SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia-openpgp) + SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia) endif ifeq ($(SEQUOIA_LIB),) - SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp) + SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia) endif ifeq ($(SEQUOIA_INC),) - SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp) + SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia) endif CFLAGS+= $(SEQUOIA_CFLAGS) CXXFLAGS+= $(SEQUOIA_CFLAGS) diff --git a/src/Makefile b/src/Makefile index 40958e98..f5dcd119 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,7 +37,7 @@ ifeq ($(BUILD_ON),OS/390) LDLIBS+= -lzz else ifeq ($(BUILD_ON),Darwin) ifeq ($(BUILD_FOR),Darwin) - LDLIBS+= -lz -liconv -mmacosx-version-min=10.10 + LDLIBS+= -lz -liconv else $(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON)) endif From 0aab558e33bf1295a11ff49d6439815806137a4a Mon Sep 17 00:00:00 2001 From: Luca Saiu Date: Fri, 4 Mar 2022 09:57:56 +0100 Subject: [PATCH 2/3] make an RC (in fact just for Gernot to have a tag for testing doc generation) --- src/pEpEngine.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pEpEngine.h b/src/pEpEngine.h index 147489c7..91245a0d 100644 --- a/src/pEpEngine.h +++ b/src/pEpEngine.h @@ -36,9 +36,10 @@ extern "C" { #define PEP_ENGINE_VERSION_PATCH 0 // the last already-released or // being-released patchlevel, // which must always be defined -#define PEP_ENGINE_VERSION_RC 6 // the last already-released RC for this +#define PEP_ENGINE_VERSION_RC 7 // the last already-released RC for this // patchlevel, or not defined if not an RC -#define PEP_ENGINE_VERSION_PLUS + // Only defined for tagged versions +//#define PEP_ENGINE_VERSION_PLUS + // Only defined when the repo is in a + // non-released non-RC state. /* The following macros serve to machine-generate a definition of PEP_ENGINE_VERSION, following the correct format as a string, from the From fa57c747caba6fcafef4fea6957c67118e60520c Mon Sep 17 00:00:00 2001 From: Luca Saiu Date: Fri, 4 Mar 2022 09:58:44 +0100 Subject: [PATCH 3/3] version: re-add the trailing "+" --- src/pEpEngine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pEpEngine.h b/src/pEpEngine.h index 91245a0d..4f4fe0a9 100644 --- a/src/pEpEngine.h +++ b/src/pEpEngine.h @@ -38,7 +38,7 @@ extern "C" { // which must always be defined #define PEP_ENGINE_VERSION_RC 7 // the last already-released RC for this // patchlevel, or not defined if not an RC -//#define PEP_ENGINE_VERSION_PLUS + // Only defined when the repo is in a +#define PEP_ENGINE_VERSION_PLUS + // Only defined when the repo is in a // non-released non-RC state. /* The following macros serve to machine-generate a definition of