[pacman-dev] [PATCH] Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD"

Allan McRae allan at archlinux.org
Fri Feb 12 11:12:03 UTC 2016

This reverts commit f9423cfa5d5b9f2041b70676438082faad1cd1ee.

This created issue when building packages with debug info multiple times.
It could be fixed, but it confirmed my initial opinion that keeping other
directories in $pkgdirbase was wrong. Use different BUILDDIRs if you want
to build different things from a single PKGBUILD.
 scripts/makepkg.sh.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 16c21b7..1c3758b 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2223,13 +2223,10 @@ if (( NOBUILD )); then
 	msg "$(gettext "Sources are ready.")"
 	exit 0 #E_OK
-	# clean existing pkg directories
+	# clean existing pkg directory
 	if [[ -d $pkgdirbase ]]; then
 		msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/"
-		for pkg in "${pkgname[@]}"; do
-			rm -rf "$pkgdirbase/$pkg"
-		done
-		unset pkg
+		rm -rf "$pkgdirbase"
 	mkdir -p "$pkgdirbase"
 	chmod a-srw "$pkgdirbase"

More information about the pacman-dev mailing list