29df05
Followup to last commit.
@@ -6,22 +6,22 @@ unset AR ARFLAGS CC CFLAGS CXX CXXFLAGS LD LDFLAGS;
|
|
6
6
|
check_prereqs git make openssl sed tar wget;
|
7
7
|
log_msg info "Build started by ${USER}@$(hostname).";
|
8
8
|
#trap
|
9
|
-
(set -o errexit; mkdir -p
|
9
|
+
(set -o errexit; mkdir -p ${PREFIX} ${WORKDIR});
|
10
10
|
BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${_nbuild:=0}}};
|
11
11
|
for BUILD_LVL in 0 1 2; do
|
12
12
|
for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do
|
13
13
|
if [ -n "${DEBUG_SCRIPT}" ]\
|
14
14
|
&& [ "x${DEBUG_SCRIPT}" != "x${BUILD_SCRIPT_FNAME}" ]; then
|
15
15
|
continue;
|
16
|
-
elif [ ! -f
|
16
|
+
elif [ ! -f ${BUILD_SCRIPT_FNAME} ]; then
|
17
17
|
continue;
|
18
18
|
else
|
19
19
|
unset BUILD_SCRIPT_RC; : $((_nbuild+=1));
|
20
20
|
log_msg info "Invoking build script \`${BUILD_SCRIPT_FNAME}'";
|
21
|
-
(set -o errexit -- $(split
|
22
|
-
SCRIPT_FNAME
|
23
|
-
cd
|
24
|
-
.
|
21
|
+
(set -o errexit -- $(split . ${BUILD_SCRIPT_FNAME%.build}); \
|
22
|
+
SCRIPT_FNAME=${BUILD_SCRIPT_FNAME}; _pwd=$(pwd); \
|
23
|
+
cd ${WORKDIR}; . ${_pwd}/build.subr; \
|
24
|
+
. ${_pwd}/${BUILD_SCRIPT_FNAME});
|
25
25
|
case ${BUILD_SCRIPT_RC:=${?}} in
|
26
26
|
0) log_msg succ "Finished build script \`${BUILD_SCRIPT_FNAME}'.";
|
27
27
|
: $((BUILD_NFINI+=1)); continue; ;;
|