summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/host-bottom.mk4
-rw-r--r--mk/host.mk5
-rwxr-xr-xscripts/prereq.sh8
-rw-r--r--target/config/Config.in.tools8
4 files changed, 11 insertions, 14 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} \
diff --git a/scripts/prereq.sh b/scripts/prereq.sh
index d4212ec93..fa2d52161 100755
--- a/scripts/prereq.sh
+++ b/scripts/prereq.sh
@@ -502,11 +502,6 @@ else
printf "found\n"
fi
-host_build_pkgconf=0
-if ! which pkgconf >/dev/null 2>&1; then
- host_build_pkgconf=1
-fi
-
host_build_tar=0
if which tar >/dev/null 2>&1; then
if ! tar --version 2>/dev/null|grep GNU >/dev/null;then
@@ -664,9 +659,6 @@ fi
if [ $host_build_patch -eq 1 ]; then
printf "\t%s\n" "select ADK_HOST_BUILD_PATCH" >> $topdir/target/config/Config.in.prereq
fi
-if [ $host_build_pkgconf -eq 1 ]; then
- printf "\t%s\n" "select ADK_HOST_BUILD_PKGCONF" >> $topdir/target/config/Config.in.prereq
-fi
if [ $host_build_findutils -eq 1 ]; then
printf "\t%s\n" "select ADK_HOST_BUILD_FINDUTILS" >> $topdir/target/config/Config.in.prereq
fi
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 2c2e4ed26..7b8bb219c 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -43,6 +43,10 @@ config ADK_HOST_BUILD_LIBRESSL
bool
default n
+config ADK_HOST_BUILD_PKGCONF
+ bool
+ default y
+
config ADK_HOST_BUILD_WGET
bool
default n
@@ -95,10 +99,6 @@ config ADK_HOST_BUILD_PATCH
bool
default n
-config ADK_HOST_BUILD_PKGCONF
- bool
- default n
-
config ADK_HOST_BUILD_SED
bool
default n