aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2020-03-13 13:18:03 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2020-03-13 13:18:03 +0000
commitcd371f92d29e5985ed9918aaa2d6140b4ce27b47 (patch)
treec9c5a201a34dc4bf03418eb0da1c3ae25ff70e70
parentc60edfe62c14e0fb235ca93297118d8501ee44ed (diff)
downloadcpt-cd371f92d29e5985ed9918aaa2d6140b4ce27b47.tar.gz
kiss: Revert build change. Needs more thought
FossilOrigin-Name: 02896119e3f1e306a48c23c9224773fe116f98f059a8880456ced3fe71395cd3
-rwxr-xr-xkiss9
1 files changed, 2 insertions, 7 deletions
diff --git a/kiss b/kiss
index a2053be..b9d89d2 100755
--- a/kiss
+++ b/kiss
@@ -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"