From 5fc6cf03a1585a5829f9ad90b991ae63443c4d0f Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Jun 10 2005 17:19:17 +0000 Subject: fix 159117 --- diff --git a/brp-strip b/brp-strip index 3a4f923..4882f5f 100755 --- a/brp-strip +++ b/brp-strip @@ -10,5 +10,5 @@ for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep -v ' shared object,' | \ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do - $STRIP -g $f || : + $STRIP -g "$f" || : done diff --git a/brp-strip-comment-note b/brp-strip-comment-note index db32226..0b63efe 100755 --- a/brp-strip-comment-note +++ b/brp-strip-comment-note @@ -19,5 +19,5 @@ for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm grep ALLOC >/dev/null; then note= fi - $STRIP -R .comment $note $f || : + $STRIP -R .comment $note "$f" || : done diff --git a/brp-strip-shared b/brp-strip-shared index 1e8300e..9b78d5e 100755 --- a/brp-strip-shared +++ b/brp-strip-shared @@ -16,5 +16,5 @@ for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep ' shared object,' | \ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do - $STRIP --strip-unneeded $f + $STRIP --strip-unneeded "$f" done diff --git a/brp-strip-static-archive b/brp-strip-static-archive index 98d5d65..786e7f3 100755 --- a/brp-strip-static-archive +++ b/brp-strip-static-archive @@ -12,5 +12,5 @@ for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep 'current ar archive' | \ sed -n -e 's/^\(.*\):[ ]*current ar archive/\1/p'`; do - $STRIP -g $f + $STRIP -g "$f" done diff --git a/find-provides b/find-provides index e955b15..6af54cd 100755 --- a/find-provides +++ b/find-provides @@ -60,4 +60,9 @@ done | sort -u [ -x /usr/lib/rpm/redhat/tcl.prov -a -n "$tcllist" ] && echo $tcllist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/tcl.prov | sort -u +# +# --- libtool +[ -x /usr/lib/rpm/redhat/find-provides.libtool ] && + echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.libtool | sort -u + exit 0 diff --git a/find-provides.libtool b/find-provides.libtool new file mode 100755 index 0000000..042ab29 --- /dev/null +++ b/find-provides.libtool @@ -0,0 +1,10 @@ +#!/bin/sh +while read possible ; do + case "$possible" in + *.la) + if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then + echo "libtool($possible)" + fi + ;; + esac +done diff --git a/find-provides.pkgconfig b/find-provides.pkgconfig new file mode 100755 index 0000000..389bef7 --- /dev/null +++ b/find-provides.pkgconfig @@ -0,0 +1,22 @@ +#!/bin/bash +pkgconfig=${1:-/usr/bin/pkg-config} +test -x $pkgconfig || exit 0 +while read filename ; do +case "${filename}" in +*.pc) + # Assume that this file doesn't contain useful information. + needs_pkgconfig=false + # Query the dependencies of the package. + $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do + # We have a dependency. Make a note that we need the pkgconfig + # tool for this package. + echo "pkgconfig($n)" "$r" "$v" + needs_pkgconfig=true + done + # The dependency on the pkgconfig package itself. + if $needs_pkgconfig ; then + echo pkgconfig + fi + ;; +esac +done diff --git a/find-requires.libtool b/find-requires.libtool new file mode 100755 index 0000000..4d95ddb --- /dev/null +++ b/find-requires.libtool @@ -0,0 +1,15 @@ +#!/bin/sh +while read possible ; do + case "$possible" in + *.la) + for dep in `grep ^dependency_libs= "$possible" 2> /dev/null | \ + sed -r -e "s,^dependency_libs='(.*)',\1,g"` ; do + case "$dep" in + /*.la) + echo "libtool($dep)" + ;; + esac + done + ;; + esac +done diff --git a/find-requires.pkgconfig b/find-requires.pkgconfig new file mode 100755 index 0000000..ff4f8bd --- /dev/null +++ b/find-requires.pkgconfig @@ -0,0 +1,11 @@ +#!/bin/bash +pkgconfig=${1:-/usr/bin/pkg-config} +test -x $pkgconfig || exit 0 +while read filename ; do +case "${filename}" in +*.pc) + $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do + echo "pkgconfig($n)" "$r" "$v" + done +esac +done