]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- for .la symlinks generate libtool(symlink), not libtool(target) Provides
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 29 Jul 2011 17:36:37 +0000 (17:36 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm-libtool-deps.patch -> 1.10

rpm-libtool-deps.patch

index 450093f59d78ea9cccfd0bac6f141fb584607f8e..4dc62f4e7c64f29e57e65c144a33566aaf1ca66a 100644 (file)
@@ -1,6 +1,6 @@
 --- rpm-4.4.8.org/scripts/libtooldeps.sh       2005-11-12 22:20:42.000000000 +0100
 +++ rpm-4.4.8/scripts/libtooldeps.sh   2006-11-26 20:06:49.254008750 +0100
-@@ -5,15 +5,18 @@
+@@ -5,15 +5,17 @@
      exit 0
  }
  
  -P|--provides)
      shift
 -    RPM_BUILD_ROOT="$1"
-+    RPM_BUILD_ROOT="`readlink -f "$1"`"
++    RPM_BUILD_ROOT="$1"
      while read possible
      do
        case "$possible" in
        *.la)
 -          if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then
-+          possible="`readlink -f "$possible" 2> /dev/null || echo "$possible"`"
-+          if file "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then
++          if file -L "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then
                possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
                echo "libtool($possible)"
            fi
-@@ -22,21 +25,28 @@
+@@ -22,21 +24,28 @@
      done
      ;;
  -R|--requires)
This page took 0.039864 seconds and 4 git commands to generate.