mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/nginx: drop gdlib-config

Browse Source 
Drop gdlib-config and use pkg-config to find gd.
Indeed, gdlib.pc is available since version 2.1.0 and
071a2a94ee
and gdlib-config has been dropped from version 2.3.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2020-07-31 10:07:15 +02:00
committed by Thomas Petazzoni
parent 16ed1d9fba
commit 61ac7fcc6c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch
View File

@@ -9,6 +9,8 @@ dependencies.
Signed-off-by: Martin Bark <martin@barkynet.com> Signed-off-by: Martin Bark <martin@barkynet.com>
[Peter: updated for 1.15.6] [Peter: updated for 1.15.6]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com> 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 ++-- auto/lib/libgd/conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -17,14 +19,15 @@ diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 67863976..1a4379a5 100644 index 67863976..1a4379a5 100644
--- a/auto/lib/libgd/conf --- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf
@@ -7,8 +7,8 @@ @@ -7,8 +7,9 @@
ngx_feature_name= ngx_feature_name=
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <gd.h>" ngx_feature_incs="#include <gd.h>"
- ngx_feature_path= - ngx_feature_path=
- ngx_feature_libs="-lgd" - ngx_feature_libs="-lgd"
+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" + ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib|
+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" + 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); ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);
(void) img" (void) img"
. auto/feature . auto/feature

1
package/nginx/nginx.mk
View File

@@ -280,7 +280,6 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR
define NGINX_CONFIGURE_CMDS define NGINX_CONFIGURE_CMDS
cd $(@D) ; $(NGINX_CONF_ENV) \ cd $(@D) ; $(NGINX_CONF_ENV) \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \
./configure $(NGINX_CONF_OPTS) \ ./configure $(NGINX_CONF_OPTS) \
--with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)" --with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)"
endef endef