moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-09 04:57:59 -05:00
Code Issues Releases Wiki Activity

* makepkg: fix installation of dependencies with version comparitors.

Browse Source
This commit is contained in:
Dan McGee 2007-03-19 22:48:54 +00:00
parent eef6154620
commit 62d0a00511
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/makepkg
View File

@ -201,6 +201,11 @@ handledeps() {
haveperm=1 haveperm=1
fi 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 [ "$deplist" != "" -a $haveperm -eq 1 ]; then
if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then
# install missing deps from binary packages (using pacman -S and sudo) # install missing deps from binary packages (using pacman -S and sudo)
@ -211,7 +216,7 @@ handledeps() {
FAKEROOTKEY2=$FAKEROOTKEY FAKEROOTKEY2=$FAKEROOTKEY
unset FAKEROOTKEY unset FAKEROOTKEY
fi fi
sudo pacman $PACMAN_OPTS -S $deplist sudo pacman $PACMAN_OPTS -S $striplist
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
error "Failed to install missing dependencies." error "Failed to install missing dependencies."
exit 1 exit 1
@ -223,7 +228,7 @@ handledeps() {
elif [ "$DEP_BIN" = "1" ]; then elif [ "$DEP_BIN" = "1" ]; then
# install missing deps from binary packages (using pacman -S) # install missing deps from binary packages (using pacman -S)
msg "Installing missing dependencies..." msg "Installing missing dependencies..."
pacman $PACMAN_OPTS -S $deplist pacman $PACMAN_OPTS -S $striplist
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
error "Failed to install missing dependencies." error "Failed to install missing dependencies."
exit 1 exit 1
@ -237,7 +242,7 @@ handledeps() {
fi fi
# TODO: handle version comparators (eg, glibc>=2.2.5) # TODO: handle version comparators (eg, glibc>=2.2.5)
msg "Building missing dependencies..." msg "Building missing dependencies..."
for dep in $deplist; do for dep in $striplist; do
candidates=$(find $SRCROOT -type d -name "$dep") candidates=$(find $SRCROOT -type d -name "$dep")
if [ "$candidates" = "" ]; then if [ "$candidates" = "" ]; then
error "Could not find \"$dep\" under $SRCROOT" error "Could not find \"$dep\" under $SRCROOT"