0004-auto-lib-libxslt-conf-allow-to-override-ngx_feature_.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  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. Because libxml2 headers are not in /usr/include by default, hardcoding the
  7. include directory to /usr/include/libxml2 does not play well when
  8. cross-compiling, or if libxml2 has been installed somewhere else.
  9. This patch allows to define/override the libxslt include directory, and
  10. the libxslt libs flags.
  11. Being able to override the include location is especially useful when
  12. cross-compiling to prevent gcc from complaining about unsafe include
  13. location for cross-compilation (-Wpoision-system-directories).
  14. So far, this warning is only triggered by libxslt.
  15. Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  16. ---
  17. auto/lib/libxslt/conf | 4 ++--
  18. 1 file changed, 2 insertions(+), 2 deletions(-)
  19. diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
  20. index bc19d83..386f1a0 100644
  21. --- a/auto/lib/libxslt/conf
  22. +++ b/auto/lib/libxslt/conf
  23. @@ -12,8 +12,8 @@
  24. #include <libxslt/xsltInternals.h>
  25. #include <libxslt/transform.h>
  26. #include <libxslt/xsltutils.h>"
  27. - ngx_feature_path="/usr/include/libxml2"
  28. - ngx_feature_libs="-lxml2 -lxslt"
  29. + ngx_feature_path="${ngx_feature_path_libxslt:=/usr/include/libxml2}"
  30. + ngx_feature_libs="${ngx_feature_libs_libxslt:=-lxml2 -lxslt}"
  31. ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
  32. xsltStylesheetPtr sheet = NULL;
  33. xmlDocPtr doc;
  34. --
  35. 1.9.2