1 From c479a18227d2171fc4c2565fd38e905bd945026f Mon Sep 17 00:00:00 2001
2 From: Dariusz Michaluk <d.michaluk@samsung.com>
3 Date: Thu, 18 Jul 2019 15:05:24 +0200
4 Subject: [PATCH 2/3] Migrate to openssl 1.1
6 Change-Id: Ie5b7c20fab22ba507f256f0adb5cfe5282e21f02
8 Makefile | 12 ++++++------
9 packaging/grpc.spec | 2 +-
10 2 files changed, 7 insertions(+), 7 deletions(-)
12 diff --git a/Makefile b/Makefile
13 index 4ddd3cf..33753a8 100644
16 @@ -517,7 +517,7 @@ IS_GIT_FOLDER = true
19 ifeq ($(HAS_PKG_CONFIG),true)
20 -OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
21 +OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl1.1
22 ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
23 PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.5.0 protobuf
24 CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
25 @@ -742,12 +742,12 @@ CPPFLAGS := -I$(EMBED_OPENSSL)/include $(CPPFLAGS)
26 else # EMBED_OPENSSL=false
27 ifeq ($(HAS_PKG_CONFIG),true)
28 OPENSSL_PKG_CONFIG = true
29 -PC_REQUIRES_SECURE = openssl
30 -CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
31 -LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
32 +PC_REQUIRES_SECURE = openssl1.1
33 +CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl1.1) $(CPPFLAGS)
34 +LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl1.1)
35 ifeq ($(SYSTEM),Linux)
36 ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
37 -LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
38 +LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl1.1 | sed s/L/Wl,-rpath,/)
39 endif # LDFLAGS_OPENSSL_PKG_CONFIG=''
41 LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
42 @@ -763,7 +763,7 @@ endif # EMBED_OPENSSL
45 ifeq ($(OPENSSL_PKG_CONFIG),true)
46 -LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
47 +LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl1.1)
49 LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))