From b66e0183982574a6429e4a9c023d10a5e2bea151 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, 10 Sep 2016 15:16:55 +0200 Subject: Adds msgfmt and Perl {autodie,ExtUtils::MakeMaker} prerequisite dependencies. --- build.sh | 7 +++++++ build.vars | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 1b4e2b28..b59834fb 100755 --- a/build.sh +++ b/build.sh @@ -56,6 +56,7 @@ done; # Check whether the pathnames in build.vars contain non-empty valid values. # Check whether all prerequisite command names resolve. # Check whether all prerequisite pathnames resolve. +# Check whether all prerequisite Perl modules exist. for __ in $(export | sed -e 's/^export //' -e 's/=.*$//'); do if ! match_list "${CLEAR_ENV_VARS_EXCEPT}" " " "${__}"; then unset "${__}"; @@ -81,6 +82,12 @@ for __ in ${CHECK_PREREQ_CMDS} ${CHECK_PREREQ_FILES}; do fi; fi; done; +for __ in ${CHECK_PREREQ_PERL_MODULES}; do + if ! perl -M"${__}" -e "" 2>/dev/null; then + log_msg fail "Error: missing prerequisite Perl module \`${__}'."; + __exit=1; + fi; +done; if [ ${__exit:-0} = 1 ]; then exit 1; elif [ -n "${__exit}" ]; then diff --git a/build.vars b/build.vars index 85209943..582780e6 100644 --- a/build.vars +++ b/build.vars @@ -41,8 +41,9 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${BUILD_LOG_FNAME:=${PREFIX}/build.log}; : ${BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last}; : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; -: ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint awk basename bunzip2 find flex git groff gunzip install libtool lzma make makeinfo nl nroff openssl patch sed sha256sum sort tar tee tr uname wget xz"}; +: ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint awk basename bunzip2 find flex git groff gunzip install libtool lzma make makeinfo msgfmt nl nroff openssl patch sed sha256sum sort tar tee tr uname wget xz"}; : ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"}; +: ${CHECK_PREREQ_PERL_MODULES:="autodie ExtUtils::MakeMaker"}; : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"}; : ${CLEAR_ENV_VARS_EXCEPT:="ARG_TARBALL ARG_VERBOSE HOME PATH SHELL TERM USER"}; : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"}; -- cgit v1.2.3