[ptxdist] [PATCH 17/22] nginx: update pkg-config patches from buildroot

[Clemens Gruber <clemens.gruber@pqgruber.com>]

The regular expression that drops the -I flag from the output of
pkg-config --cflags-only-I did not work properly (Broke paths like
/usr/Some-Install-Location/include)

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch   | 7 ++++---
 .../nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index d61a5dc59..b6bd50cc3 100644
--- a/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
@@ -11,16 +11,17 @@ Signed-off-by: Martin Bark <martin@barkynet.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
-index 3a0f37be543a..3c2a60e57ec0 100644
+index 3a0f37b..3c2a60e 100644
 --- a/auto/lib/libxslt/conf
 +++ b/auto/lib/libxslt/conf
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,9 @@
                        #include <libxslt/xsltInternals.h>
                        #include <libxslt/transform.h>
                        #include <libxslt/xsltutils.h>"
 -    ngx_feature_path="/usr/include/libxml2"
 -    ngx_feature_libs="-lxml2 -lxslt"
-+    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')"
++    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|
++			 sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +    ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
      ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                        xsltStylesheetPtr   sheet = NULL;
diff --git a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
index 21ebd769b..b5772e411 100644
--- a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
@@ -11,16 +11,17 @@ Signed-off-by: Martin Bark <martin@barkynet.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
-index e7d3795b2a8f..a24695c53bfb 100644
+index 39d9602..995c6f3 100644
 --- a/auto/lib/openssl/conf
 +++ b/auto/lib/openssl/conf
-@@ -58,8 +58,8 @@ else
+@@ -58,8 +58,9 @@ 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_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|
++			     sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +        ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
          ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
          . auto/feature
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de