0006-auto-lib-openssl-conf-use-pkg-config.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  1. From 756556d127da291cad8a2c007a89124a692aef7f Mon Sep 17 00:00:00 2001
  2. From: Martin Bark <martin@barkynet.com>
  3. Date: Fri, 6 May 2016 14:48:31 +0100
  4. Subject: [PATCH] auto/lib/openssl/conf: use pkg-config
  5. Change to using pkg-config to find the path to openssl and its
  6. dependencies.
  7. Signed-off-by: Martin Bark <martin@barkynet.com>
  8. ---
  9. auto/lib/openssl/conf | 4 ++--
  10. 1 file changed, 2 insertions(+), 2 deletions(-)
  11. diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
  12. index 39d9602..995c6f3 100644
  13. --- a/auto/lib/openssl/conf
  14. +++ b/auto/lib/openssl/conf
  15. @@ -58,8 +58,9 @@ else
  16. ngx_feature_name="NGX_OPENSSL"
  17. ngx_feature_run=no
  18. ngx_feature_incs="#include <openssl/ssl.h>"
  19. - ngx_feature_path=
  20. - ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
  21. + ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|
  22. + sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
  23. + ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
  24. ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
  25. . auto/feature
  26. --
  27. 2.8.2