X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-libtool-deps.patch;h=6b6a8612fb9902ca59b29ba017ebb66119b8163f;hp=bbcb65407de9961ab6ced3331bb9a4fdd6bc581d;hb=c74077dc412cc63d6c7e79af5ca8a944a66979c5;hpb=f2e1b51e7b3087a5f1a8b0f007330425fd3eee85 diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch index bbcb654..6b6a861 100644 --- a/rpm-libtool-deps.patch +++ b/rpm-libtool-deps.patch @@ -6,7 +6,7 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh case "$possible" in *.la) - if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then -+ $possible="`readlink -f "$possible"`" ++ possible="`readlink -f "$possible" 2> /dev/null || echo "$possible"`" + if file "$possible" | grep -iq 'libtool library file' 2> /dev/null ; the possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`" echo "libtool($possible)" @@ -15,7 +15,8 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh do case "$dep" in /*.la) -+ $dep="`readlink -f "$dep"`" ++ dep="`readlink -f "$dep" 2> /dev/null || echo "$dep"`" echo "libtool($dep)" ;; esac +