761259c934
See here for a Changelog and CVE's: http://nginx.org/en/CHANGES-1.26 Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore. Patch 0009 is no longer required as it was fixed in another way upstream: https://hg.nginx.org/nginx/rev/fb989e24c60a Patch 0011 is upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 Reorder the remaining patches and update .checkpackageignore accordingly. The LICENSE file is changed, the year changed from 2022 to 2024. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 0551f2e5eb4143be0aacc0185cdc4afc9ca80204 Mon Sep 17 00:00:00 2001
|
|
From: Martin Bark <martin@barkynet.com>
|
|
Date: Fri, 6 May 2016 14:48:49 +0100
|
|
Subject: [PATCH] auto/lib/libgd/conf: use pkg-config
|
|
|
|
Change to using pkg-config to find the path to libgd and its
|
|
dependencies.
|
|
|
|
Signed-off-by: Martin Bark <martin@barkynet.com>
|
|
[Peter: updated for 1.15.6]
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
[Fabrice: use pkg-config instead of gdlib-config]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
auto/lib/libgd/conf | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
|
|
index 67863976..1a4379a5 100644
|
|
--- a/auto/lib/libgd/conf
|
|
+++ b/auto/lib/libgd/conf
|
|
@@ -7,8 +7,9 @@
|
|
ngx_feature_name=
|
|
ngx_feature_run=no
|
|
ngx_feature_incs="#include <gd.h>"
|
|
- ngx_feature_path=
|
|
- ngx_feature_libs="-lgd"
|
|
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib|
|
|
+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
|
|
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)"
|
|
ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);
|
|
(void) img"
|
|
. auto/feature
|
|
--
|
|
2.11.0
|
|
|