[pacman-dev] CVS update of pacman-lib/scripts (makepkg)

[Dan McGee]

    Date: Monday, March 19, 2007 @ 18:48:54
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.60 -> 1.61)

* makepkg: fix installation of dependencies with version comparitors.


---------+
 makepkg |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.60 pacman-lib/scripts/makepkg:1.61
--- pacman-lib/scripts/makepkg:1.60	Sun Mar 18 19:09:50 2007
+++ pacman-lib/scripts/makepkg	Mon Mar 19 18:48:54 2007
@@ -201,6 +201,11 @@
 		haveperm=1
 	fi
 
+	for dep in $deplist; do
+		depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||')
+		striplist="$striplist $depstrip"
+	done
+
 	if [ "$deplist" != "" -a $haveperm -eq 1 ]; then
 		if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then
 			# install missing deps from binary packages (using pacman -S and sudo)
@@ -211,7 +216,7 @@
 				FAKEROOTKEY2=$FAKEROOTKEY
 				unset FAKEROOTKEY
 			fi
-			sudo pacman $PACMAN_OPTS -S $deplist
+			sudo pacman $PACMAN_OPTS -S $striplist
 			if [ $? -eq 1 ]; then
 				error "Failed to install missing dependencies."
 				exit 1
@@ -223,7 +228,7 @@
 		elif [ "$DEP_BIN" = "1" ]; then
 			# install missing deps from binary packages (using pacman -S)
 			msg "Installing missing dependencies..."
-			pacman $PACMAN_OPTS -S $deplist
+			pacman $PACMAN_OPTS -S $striplist
 			if [ $? -eq 1 ]; then
 				error "Failed to install missing dependencies."
 				exit 1
@@ -237,7 +242,7 @@
 			fi
 			# TODO: handle version comparators (eg, glibc>=2.2.5)
 			msg "Building missing dependencies..."
-			for dep in $deplist; do
+			for dep in $striplist; do
 				candidates=$(find $SRCROOT -type d -name "$dep")
 				if [ "$candidates" = "" ]; then
 					error "Could not find \"$dep\" under $SRCROOT"