From ed4109698b2e5ff64d7f8d8c5349b512a6d2de3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 19 Jan 2019 18:26:53 +0000
Subject: build.sh, subr/build_checks.subr, vars/midipix.vars: removes
 ${DEFAULT_CHECK_PREREQ_{CMDS,FILES{,_DYNAMIC},PERL_MODULES}}.
 etc/build.usage: update target list. subr/build_checks.subr: merges remaining
 checks into subr/build_init.subr.

---
 vars/midipix.vars | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

(limited to 'vars')

diff --git a/vars/midipix.vars b/vars/midipix.vars
index f7cbcd66..7a779d57 100644
--- a/vars/midipix.vars
+++ b/vars/midipix.vars
@@ -18,10 +18,14 @@
 : ${PREFIX_RPM:=${PREFIX}/rpm};
 : ${BUILD_DLCACHEDIR:=${PREFIX_ROOT}/dlcache};
 : ${BUILD_WORKDIR:=${PREFIX}/tmp};
-: ${DEFAULT_LOG_ENV_VARS:="
-	ARCH BUILD BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT
-	HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX
-	PREFIX_NATIVE USER"};
+: ${DEFAULT_CHECK_PATH_VARS:="
+	PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"};
+: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="
+	HOME PATH TERM DEFAULT_TARBALL_SIGN_GPG_KEY USER"};
+: ${DEFAULT_CLEAR_PREFIX_PATHS:="
+	bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native
+	rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host
+	pkglist.native SHA256SUMS SHA256SUMS.last"};
 : ${DEFAULT_INSTALL_FILES_DESTDIR:="
 	/=bin /=include /=lib /=lib/pkgconfig /=sbin
 	/=share /=share/doc /=share/info /=share/man
@@ -33,6 +37,10 @@
 	@share/man=man
 	@../lib/pkgconfig=share/pkgconfig
 	@.=usr"};
+: ${DEFAULT_LOG_ENV_VARS:="
+	ARCH BUILD BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT
+	HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX
+	PREFIX_NATIVE USER"};
 
 # Default flags & variables
 : ${DEFAULT_BUILD_CPUS:=};
@@ -88,24 +96,4 @@
 : ${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX:=minipix-${ARCH}-${BUILD}.};
 : ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.};
 
-# Check & clear predicates
-: ${DEFAULT_CHECK_PATH_VARS:="
-	PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"};
-: ${DEFAULT_CHECK_PREREQ_CMDS:="
-	aclocal autoconf autopoint awk basename bunzip2 find flex gcc git groff gunzip install
-	ld libtool lzma make makeinfo msgfmt nl nroff openssl paste patch python sed sha256sum
-	sort tar tee tic tr uname wget xz"};
-: ${DEFAULT_CHECK_PREREQ_FILES_DYNAMIC:='
-	/usr/share/groff/$(groff -v 2>/dev/null | awk '\''/^GNU groff version /{print $NF}'\'')/tmac/e.tmac'};
-: ${DEFAULT_CHECK_PREREQ_FILES:="
-	/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
-: ${DEFAULT_CHECK_PREREQ_PERL_MODULES:="
-	autodie ExtUtils::MakeMaker"};
-: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="
-	HOME PATH TERM DEFAULT_TARBALL_SIGN_GPG_KEY USER"};
-: ${DEFAULT_CLEAR_PREFIX_PATHS:="
-	bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native
-	rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host
-	pkglist.native SHA256SUMS SHA256SUMS.last"};
-
 # vim:filetype=sh textwidth=0
-- 
cgit v1.2.3