The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / nginx / 0004-auto-lib-libxslt-conf-allow-to-override-ngx_feature_.patch
1 From 5d281572d0afbf69d934737e1ee4c553670a46cc Mon Sep 17 00:00:00 2001
2 From: Samuel Martin <s.martin49@gmail.com>
3 Date: Thu, 29 May 2014 19:22:27 +0200
4 Subject: [PATCH 4/5] auto/lib/libxslt/conf: allow to override ngx_feature_path
5  and ngx_feature_libs
6
7 Because libxml2 headers are not in /usr/include by default, hardcoding the
8 include directory to /usr/include/libxml2 does not play well when
9 cross-compiling, or if libxml2 has been installed somewhere else.
10
11 This patch allows to define/override the libxslt include directory, and
12 the libxslt libs flags.
13
14 Being able to override the include location is especially useful when
15 cross-compiling to prevent gcc from complaining about unsafe include
16 location for cross-compilation (-Wpoision-system-directories).
17
18 So far, this warning is only triggered by libxslt.
19
20 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
21 ---
22  auto/lib/libxslt/conf | 4 ++--
23  1 file changed, 2 insertions(+), 2 deletions(-)
24
25 diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
26 index bc19d83..386f1a0 100644
27 --- a/auto/lib/libxslt/conf
28 +++ b/auto/lib/libxslt/conf
29 @@ -12,8 +12,8 @@
30                        #include <libxslt/xsltInternals.h>
31                        #include <libxslt/transform.h>
32                        #include <libxslt/xsltutils.h>"
33 -    ngx_feature_path="/usr/include/libxml2"
34 -    ngx_feature_libs="-lxml2 -lxslt"
35 +    ngx_feature_path="${ngx_feature_path_libxslt:=/usr/include/libxml2}"
36 +    ngx_feature_libs="${ngx_feature_libs_libxslt:=-lxml2 -lxslt}"
37      ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
38                        xsltStylesheetPtr   sheet = NULL;
39                        xmlDocPtr           doc;
40 --
41 1.9.2
42