From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Bark Date: Mon, 9 May 2016 12:29:01 +0100 Subject: [Buildroot] [PATCH 3/5] package/nginx: fix libgd support In-Reply-To: <1462793343-20234-1-git-send-email-martin@barkynet.com> References: <1462793343-20234-1-git-send-email-martin@barkynet.com> Message-ID: <1462793343-20234-3-git-send-email-martin@barkynet.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Change to using gdlib-config to find libgd and its dependencies. This fixes: http://autobuild.buildroot.net/results/d1806140eccb1202cb8b223289510d64fb28acb6/ Signed-off-by: Martin Bark --- .../0007-auto-lib-libgd-conf-use-pkg-config.patch | 31 ++++++++++++++++++++++ package/nginx/nginx.mk | 1 + 2 files changed, 32 insertions(+) create mode 100644 package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch new file mode 100644 index 0000000..3750f22 --- /dev/null +++ b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch @@ -0,0 +1,31 @@ +From fd9885fe5fef5826034547ca6be7299863f99769 Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Fri, 6 May 2016 14:48:49 +0100 +Subject: [PATCH 7/8] 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 +--- + 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 6e4e91c..1c536a2 100644 +--- a/auto/lib/libgd/conf ++++ b/auto/lib/libgd/conf +@@ -7,8 +7,8 @@ + ngx_feature_name= + ngx_feature_run=no + ngx_feature_incs="#include " +- ngx_feature_path= +- ngx_feature_libs="-lgd" ++ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" ++ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" + ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);" + . auto/feature + +-- +2.8.2 + diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 24f4ac3..9cc2326 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -237,6 +237,7 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR define NGINX_CONFIGURE_CMDS cd $(@D) ; $(NGINX_CONF_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \ ./configure $(NGINX_CONF_OPTS) endef -- 2.8.2