diff options
| author | Martin Bark <martin@barkynet.com> | 2016-05-09 12:28:59 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-05-13 23:04:34 +0200 |
| commit | 285f648658c4029e33bbe52a214524396ce1d226 (patch) | |
| tree | 90a24b556ba8f5f33b92061eaaeab0593033a865 /package/nginx/nginx.mk | |
| parent | 7f338c69c631faedca4e2da3f8c8379a3a29013f (diff) | |
| download | buildroot-285f648658c4029e33bbe52a214524396ce1d226.tar.gz buildroot-285f648658c4029e33bbe52a214524396ce1d226.zip | |
package/nginx: fix libxslt support
Change to using pkg-config to find libxslt and it dependencies.
This Fixes:
http://autobuild.buildroot.net/results/382699bbed15f598625b9296e464d1349ef559f8
Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nginx/nginx.mk')
| -rw-r--r-- | package/nginx/nginx.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index c1e8367dab..24f4ac3a7b 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -8,6 +8,7 @@ NGINX_VERSION = 1.10.0 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2c NGINX_LICENSE_FILES = LICENSE +NGINX_DEPENDENCIES = host-pkgconf NGINX_CONF_OPTS = \ --crossbuild=Linux::$(BR2_ARCH) \ @@ -118,8 +119,6 @@ endif ifeq ($(BR2_PACKAGE_NGINX_HTTP_XSLT_MODULE),y) NGINX_DEPENDENCIES += libxml2 libxslt NGINX_CONF_OPTS += --with-http_xslt_module -NGINX_CONF_ENV += \ - ngx_feature_path_libxslt=$(STAGING_DIR)/usr/include/libxml2 endif ifeq ($(BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE),y) @@ -236,7 +235,9 @@ endef NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR define NGINX_CONFIGURE_CMDS - cd $(@D) ; $(NGINX_CONF_ENV) ./configure $(NGINX_CONF_OPTS) + cd $(@D) ; $(NGINX_CONF_ENV) \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + ./configure $(NGINX_CONF_OPTS) endef define NGINX_BUILD_CMDS |
