package/nginx: fix openssl support
Change to using pkg-config to find openssl and its dependencies. This fixes: http://autobuild.buildroot.net/results/17db76c3a099e7592af343bbe119dfe717cd7999/ Signed-off-by: Martin Bark <martin@barkynet.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
285f648658
commit
e0c8e18ed1
@ -0,0 +1,31 @@
|
|||||||
|
From 756556d127da291cad8a2c007a89124a692aef7f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Bark <martin@barkynet.com>
|
||||||
|
Date: Fri, 6 May 2016 14:48:31 +0100
|
||||||
|
Subject: [PATCH 6/8] auto/lib/openssl/conf: use pkg-config
|
||||||
|
|
||||||
|
Change to using pkg-config to find the path to openssl and its
|
||||||
|
dependencies.
|
||||||
|
|
||||||
|
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||||
|
---
|
||||||
|
auto/lib/openssl/conf | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
|
||||||
|
index 39d9602..995c6f3 100644
|
||||||
|
--- a/auto/lib/openssl/conf
|
||||||
|
+++ b/auto/lib/openssl/conf
|
||||||
|
@@ -50,8 +50,8 @@ else
|
||||||
|
ngx_feature_name="NGX_OPENSSL"
|
||||||
|
ngx_feature_run=no
|
||||||
|
ngx_feature_incs="#include <openssl/ssl.h>"
|
||||||
|
- ngx_feature_path=
|
||||||
|
- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
|
||||||
|
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|sed 's/-I//g')"
|
||||||
|
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
|
||||||
|
ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
|
||||||
|
. auto/feature
|
||||||
|
|
||||||
|
--
|
||||||
|
2.8.2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user