kiss: Revert build change. Needs more thought

This commit is contained in:
Dylan Araps 2020-03-13 15:18:04 +02:00
parent 58f5819af2
commit f590b5bc73
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 2 additions and 7 deletions

9
kiss
View File

@ -583,19 +583,14 @@ pkg_build() {
# Move to the build directory.
cd "$mak_dir/$pkg"
# Copy the build file to the current cache directory so that
# it can be modified by package manager hooks. This allows
# for simple build changes to be made without the need to
# fork the entire package.
cp -f "$repo_dir/build" .build
log "$pkg" "Starting build"
run_hook pre-build "$pkg" "$pkg_dir/$pkg"
# Call the build script, log the output to the terminal
# and to a file. There's no PIPEFAIL in POSIX shelll so
# we must resort to tricks like killing the script ourselves.
{ "./.build" "$pkg_dir/$pkg" 2>&1 || {
{ "$repo_dir/build" "$pkg_dir/$pkg" 2>&1 || {
log "$pkg" "Build failed"
log "$pkg" "Log stored to $log_dir/$pkg-$time-$pid"
run_hook build-fail "$pkg" "$pkg_dir/$pkg"