From a8fa37a56a693da77b4e01f8fbe972d9cc86b328 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Feb 27 2016 19:21:36 +0000
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.)

---

diff --git a/build.sh b/build.sh
index a4954bd..8cc64b5 100755
--- a/build.sh
+++ b/build.sh
@@ -80,7 +80,6 @@ for BUILD_LVL in 0 1 2 3; do
 					tar -C ${PREFIX} -cpf - build.log $(cd ${PREFIX} && find ${WORKDIR#${PREFIX}/} -mindepth 1 -maxdepth 1 -type d -iname ${PKG_SUBDIR}-*) |\
 						bzip2 -c - > ${BUILD_DEBUG_TARBALL_FNAME};
 					log_msg info "Please upload ${BUILD_DEBUG_TARBALL_FNAME} and provide an URL to it in <irc://irc.freenode.net/midipix>.";
-					exit 1;
 				fi;
 				: $((BUILD_NFAIL+=1)); break; ;;
 			esac;
diff --git a/build.vars b/build.vars
index 4011f2b..2f52395 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};