All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/nginx: fix build
@ 2017-07-14 13:04 Peter Korsgaard
  0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2017-07-14 13:04 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=2b2d53c3342281a74a4bea84aac0facc1490f4d8
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Add a patch to nginx configuration system fixing misdetected unneeded PCRE
dependency.

This patch has been submitted upstream [1].

Fixes:
  http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log

[1] http://mailman.nginx.org/pipermail/nginx-devel/2017-July/010308.html

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...nf-fix-PCRE-condition-WRT-the-http-and-ht.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch b/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
new file mode 100644
index 0000000..0845651
--- /dev/null
+++ b/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
@@ -0,0 +1,33 @@
+From 9668f0d5ecd2382fd36b7ff6a3a29abd04f6533f Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Fri, 14 Jul 2017 11:50:08 +0200
+Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and
+ http_rewrite options
+
+http_rewrite module cannot be selected when http server is disabled, so
+fix the PCRE check condition to avoid irrelevant check failure.
+
+Fixes:
+  http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ auto/lib/conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/auto/lib/conf b/auto/lib/conf
+index 0b8545a3..2c7af104 100644
+--- a/auto/lib/conf
++++ b/auto/lib/conf
+@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
+     . auto/lib/pcre/conf
+ 
+ else
+-    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
++    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
+ 
+ cat << END
+ 
+-- 
+2.13.2
+

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-07-14 13:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-14 13:04 [Buildroot] [git commit] package/nginx: fix build Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.