From 8ee843a21869a1dc38a7fc7b543b7a5a1231a4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 6 Feb 2017 01:53:57 +0100 Subject: build.sh, {subr,vars}/*: general cleanup. --- subr/pkg_configure.subr | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'subr/pkg_configure.subr') diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index 528d3001..fc70f39e 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -3,10 +3,16 @@ # pkg_configure() { - if [ ${__no_autoconf:-0} -eq 0 ]; then - CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"\ - LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}"\ - ${PKG_CONFIGURE} \ + if [ -n "${PKG_CONFIGURE}" ]; then + PKG_CONFIGURE="../${PKG_CONFIGURE}"; + else + PKG_CONFIGURE="../${PKG_SUBDIR}/configure"; + fi; + if [ -x "${PKG_CONFIGURE}" ]; then + export CFLAGS_FOR_BUILD="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}"; + CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \ + LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ + ${PKG_CONFIGURE} \ ${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG}; fi; }; -- cgit v1.2.3