diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-19 23:48:54 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-19 23:48:54 +0100 |
| commit | 62d0a00511d11607f347d191dcae6cc38a54fa24 (patch) | |
| tree | 35e5f5fc598662bd4f80e9ea45801ce8c493cbdc /scripts/makepkg | |
| parent | eef6154620981b867bf8278e75f29d26a69525d1 (diff) | |
| download | pacman-62d0a00511d11607f347d191dcae6cc38a54fa24.tar.gz pacman-62d0a00511d11607f347d191dcae6cc38a54fa24.tar.xz | |
* makepkg: fix installation of dependencies with version comparitors.
Diffstat (limited to 'scripts/makepkg')
| -rwxr-xr-x | scripts/makepkg | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/makepkg b/scripts/makepkg index 5525cdba..ccc447c5 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -201,6 +201,11 @@ handledeps() { 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 @@ handledeps() { 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 @@ handledeps() { 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 @@ handledeps() { 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" |