From a8fa37a56a693da77b4e01f8fbe972d9cc86b328 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: Sat, 27 Feb 2016 20:10:58 +0100 Subject: - Followup to b947460aacf5861255b5d7f1e521b0daf30b3b11: don't exit 1, exit normally. - Fix typo in PKG_UTIL_LINUX_LDFLAGS_CONFIGURE_EXTRA preventing util-linux from being built under some circumstances (reported by noninc.) - Add pkg-config to CHECK_PREREQ_CMDS as packages depending on ncurses need this. (reported by noninc.) --- build.vars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.vars') diff --git a/build.vars b/build.vars index 4011f2be..2f523959 100644 --- a/build.vars +++ b/build.vars @@ -14,7 +14,7 @@ : ${BUILD_STATUS_FINISHED_AT_CURRENT_FNAME:=${PREFIX}/BUILD_FINISHED_AT}; : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; : ${CFLAGS_DEFAULT:=-g3 -O0}; -: ${CHECK_PREREQ_CMDS:="flex git make mktemp openssl patch sed sort tar tee tr wget"}; +: ${CHECK_PREREQ_CMDS:="bzip2 flex git make mktemp openssl patch pkg-config sed sort tar tee tr wget"}; : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE WORKDIR"}; : ${CLEAR_ENV_VARS_EXCEPT:="HOME PATH SHELL TERM USER"}; : ${GITROOT:=git://midipix.org}; @@ -211,7 +211,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; : ${PKG_UTIL_LINUX_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_LVL3}/include}; : ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-wall --disable-write}; -: ${PKG_UTIL_LINUX_LDFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_LVL3}/lib}; +: ${PKG_UTIL_LINUX_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_LVL3}/lib}; : ${PKG_UTIL_LINUX_MAKEFLAGS_BUILD_EXTRA:=V=99}; : ${PKG_WHICH_VERSION:=2.21}; : ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad}; -- cgit v1.2.3