summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-22 23:55:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-22 23:55:31 +0100
commit1d1bbf63ba32d1199b4ecff9d2296fc79ea276ec (patch)
treeebcbd5437e6242cef2303eeba661b0d87b3fec58 /mk
parent968998a744a571cd373dc8e0553beb3811a8b53f (diff)
fix libxml2-host compile, pkgconf is mandatory
Diffstat (limited to 'mk')
-rw-r--r--mk/host-bottom.mk4
-rw-r--r--mk/host.mk5
2 files changed, 7 insertions, 2 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 6ae8f1c7e..6fcd78e88 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -9,10 +9,10 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
mkdir -p ${WRKBUILD}
ifneq (,$(filter autogen,${AUTOTOOL_STYLE}))
@$(CMD_TRACE) "autotooling.. "
- @cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE)
+ @cd ${WRKSRC}; env ${HOST_AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE)
endif
ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
- cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE)
+ cd ${WRKSRC}; env ${HOST_AUTOTOOL_ENV} autoreconf -vif $(MAKE_TRACE)
@rm -rf ${WRKSRC}/autom4te.cache
@touch ${WRKDIR}/.autoreconf_done
endif
diff --git a/mk/host.mk b/mk/host.mk
index 9c5ca1caa..9ff38ac6f 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -6,6 +6,11 @@ ifneq (,$(findstring host,$(MAKECMDGOALS)))
WRKDIR?= ${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
endif
+HOST_AUTOTOOL_ENV+= PATH='${HOST_PATH}' \
+ PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
+ PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
+ ${COMMON_ENV}
+
# this is environment for 'configure'
HOST_CONFIGURE_ENV?= PATH='${HOST_PATH}' \
${COMMON_ENV} \