updated

1 files changed, 28 insertions, 22 deletions

diff --git a/apkg b/apkg
index 407d654..21b9a6d 100755
--- a/apkg
+++ b/apkg
@@ -118,7 +118,7 @@ _cmake_build() {
 		-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
 		-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
 		$build_opt $@ \
-		-G Ninja ..
+		-B build ..
 	if [ -f build.ninja ]; then
 		ninja
 		DESTDIR=$PKG ninja install
@@ -147,26 +147,26 @@ _configure_build() {
 }
 
 _meson_build() {
-	meson setup _meson_build \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--includedir=/usr/include \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localedir=/usr/share/locale \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--sharedstatedir=/var/lib \
-		--buildtype=plain \
-		--auto-features=auto \
-		--wrap-mode=nodownload \
+	meson setup \
+		-Dprefix=/usr \
+		-Dlibdir=/usr/lib \
+		-Dincludedir=/usr/include \
+		-Ddatadir=/usr/share \
+		-Dmandir=/usr/share/man \
+		-Dinfodir=/usr/share/info \
+		-Dlocaledir=/usr/share/locale \
+		-Dsysconfdir=/etc \
+		-Dlocalstatedir=/var \
+		-Dsharedstatedir=/var/lib \
+		-Dbuildtype=plain \
+		-Dauto_features=auto \
+		-Dwrap_mode=nodownload \
 		-Db_lto=true \
 		-Db_pie=true \
-		-Db_thinlto_cache=true \
-		$build_opt || return $?
-	meson compile -C _meson_build || return $?
-	DESTDIR=$PKG meson install --no-rebuild -C _meson_build || return $?
+		$build_opt \
+		build
+	ninja -C build
+	DESTDIR=$PKG meson install -C build
 }
 
 apply_patch() {
@@ -190,7 +190,8 @@ apply_patch() {
 }
 
 msg() {
-	echo "[${name:-...}] $@"
+	ttysize=$(stty size | awk '{print $2}')
+	echo "[${name:-...}] $@" | fold -sw $ttysize
 }
 
 exitonerror() {
@@ -383,6 +384,10 @@ checkdep() {
 	# track processed pkg to avoid cycle deps
 	process="$process $1"
 	for ii in $(pkg_depends $1); do
+		# if already installed, skip
+		if [ "$skip_installed" ]; then
+			[ -s $SPM_PKGDB/$ii ] && continue
+		fi
 		# if deps already in process list, skip, cycle deps detected
 		echo $process | tr ' ' '\n' | grep -qx $ii && continue
 		# skip if itself in depends list
@@ -437,7 +442,7 @@ pkg_outdate() {
 
 pkg_remove() {
 	for i in $@; do
-		spm -r $i
+		SPM_ROOT=$APKG_ROOT spm -r $i
 	done
 }
 
@@ -488,9 +493,10 @@ pkg_depinstalll() {
 		fi
 		pkg="$pkg $p"
 	done
+	[ "$pkg" ] || exit 0
 	set -- $pkg
 	msg "Solving dependencies..."
-	for p in $(pkg_deplist $@); do
+	for p in $(skip_installed=1 pkg_deplist $@); do
 		[ -s $SPM_PKGDB/$p ] && continue
 		installthis="$installthis $p"
 	done