summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-12-10 12:46:37 -0600
committerTimo Teräs <timo.teras@iki.fi>2021-12-14 16:24:25 +0000
commit81d8d2b3f4e7d4fff65bcac8bc11c787054df1a5 (patch)
tree50327e0ab912908d442cccc0a06d7b8c993f3db1
parentf4f7796ccc9e398b047bc537e28a065dfa83c8a9 (diff)
downloadapk-tools-81d8d2b3f4e7d4fff65bcac8bc11c787054df1a5.tar.gz
apk-tools-81d8d2b3f4e7d4fff65bcac8bc11c787054df1a5.tar.bz2
apk-tools-81d8d2b3f4e7d4fff65bcac8bc11c787054df1a5.tar.xz
apk-tools-81d8d2b3f4e7d4fff65bcac8bc11c787054df1a5.zip
libfetch: use pkg-config to find openssl cflags
on mac, openssl is usually provided by Homebrew or some other third-party package management system, which means pkg-config is needed to find it. we already use pkg-config to find openssl when building apk itself. ref #10794
-rw-r--r--libfetch/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/libfetch/Makefile b/libfetch/Makefile
index c4b56f5..0c2617f 100644
--- a/libfetch/Makefile
+++ b/libfetch/Makefile
@@ -4,6 +4,13 @@ generate-y += ftperr.h httperr.h
CFLAGS_common.o += -DCA_CERT_FILE=\"$(CONFDIR)/ca.pem\" -DCA_CRL_FILE=\"$(CONFDIR)/crl.pem\"
CFLAGS_common.o += -DCLIENT_CERT_FILE=\"$(CONFDIR)/cert.pem\" -DCLIENT_KEY_FILE=\"$(CONFDIR)/cert.key\"
+PKG_CONFIG ?= pkg-config
+
+OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl)
+OPENSSL_LIBS := $(shell $(PKG_CONFIG) --libs openssl)
+
+CFLAGS_ALL += $(OPENSSL_CFLAGS)
+
quiet_cmd_generr = GENERR $@
cmd_generr = $(src)/errlist.sh $(basename $(<F))_errlist $(shell echo $(basename $(<F)) | tr a-z A-Z) $< > $@