summaryrefslogtreecommitdiff
path: root/rules.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-13 16:18:40 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-13 16:18:44 (GMT)
commita94d74d9c875b4a1c07945bf9af282221d0178b3 (patch)
treedaa2be873d758ad77006696efde6e76982f24d20 /rules.mk
parent74663fdbbd1dc92dd91f6f88dbc4f972df12c404 (diff)
rework prereq check
The new prereq check is completely implemented in POSIX shell in scripts/prereq.sh. It combines the old features from Makefile, scan-tools.sh, scan-pkgs.sh, reloc.sh and some wrappers for tools. The big benefit is to have all portability stuff in one place. Furthermore we can compile GNU make and bash on the fly, for systems lacking the required tools. All changes on the host are detected on the fly, no make prereq required anymore. The build process is separated in following three phases: 1. small wrapper Makefile is used for BSD make or GNU make 2. prereq.sh is called, doing all checking, calling Makefile.adk 3. old logic in Makefile.adk or mk/build.mk is used Tested successfully on Linux, MacOS X, Cygwin, FreeBSD, OpenBSD and NetBSD. An old depmaker bug was fixed, only optional host tools are compiled. For example, even when a host provides xz, a local xz was compiled in the past, because other packages had a build dependency on it. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/rules.mk b/rules.mk
index 25944c3..a734408 100644
--- a/rules.mk
+++ b/rules.mk
@@ -2,7 +2,6 @@
# material, please see the LICENCE file in the top-level directory.
include $(ADK_TOPDIR)/prereq.mk
-include $(ADK_TOPDIR)/mk/os.mk
-include $(ADK_TOPDIR)/.config
ifeq ($(ADK_VERBOSE),1)
@@ -15,9 +14,9 @@ MAKE_TRACE:=
EXTRA_MAKEFLAGS:=
SET_DASHX:= set -x
else
-START_TRACE:= echo -n "---> "
+START_TRACE:= echo -n " ---> "
END_TRACE:= echo
-TRACE:= echo "---> "
+TRACE:= echo " ---> "
CMD_TRACE:= echo -n
PKG_TRACE:= echo "------> "
EXTRA_MAKEFLAGS:= -s