diff options
| author | Olivier Thauvin <nanardon@mandriva.org> | 2007-02-13 22:20:51 +0000 |
|---|---|---|
| committer | Olivier Thauvin <nanardon@mandriva.org> | 2007-02-13 22:20:51 +0000 |
| commit | c404c94e8243b3eb111b1f3971b278dcc24a8d25 (patch) | |
| tree | 738aaeef1ac5c07e89bb0a074918ccd91f6d5a8d | |
| parent | 5711fbc199db949ad071c26193191d81cae2dcb9 (diff) | |
| download | rpm-setup-c404c94e8243b3eb111b1f3971b278dcc24a8d25.tar rpm-setup-c404c94e8243b3eb111b1f3971b278dcc24a8d25.tar.gz rpm-setup-c404c94e8243b3eb111b1f3971b278dcc24a8d25.tar.bz2 rpm-setup-c404c94e8243b3eb111b1f3971b278dcc24a8d25.tar.xz rpm-setup-c404c94e8243b3eb111b1f3971b278dcc24a8d25.zip | |
- disable libtool provides
| -rwxr-xr-x | find-provides.in | 3 | ||||
| -rwxr-xr-x | find-requires.in | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/find-provides.in b/find-provides.in index c593d3c..0bb9dc4 100755 --- a/find-provides.in +++ b/find-provides.in @@ -68,11 +68,14 @@ done | sort -u [ -x @RPMLIBDIR@/pkgconfigdeps.sh ] && echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/pkgconfigdeps.sh -P | sort -u +if [ -n "$LIBTOOLDEP" ]; then # # --- libtooldep deps [ -x @RPMLIBDIR@/libtooldeps.sh ] && echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/libtooldeps.sh -P | sort -u +fi + # # --- .so files. for i in `echo $filelist | tr '[:blank:]' "\n" | egrep '(/usr(/X11R6)?)?/lib(|64)(/gcc(-lib)?/.+)?/[^/]+\.so$'`; do diff --git a/find-requires.in b/find-requires.in index cd98377..2c3bc28 100755 --- a/find-requires.in +++ b/find-requires.in @@ -195,12 +195,15 @@ fi [ -x @RPMVENDORDIR@/php.req ] && \ echo $filelist | tr '[:blank:]' \\n | @RPMVENDORDIR@/php.req | sort -u -if [ -n "$REQRPM446" ]; then +if [ -n "$NOTYET" ]; then # # --- Pkgconfig deps [ -x @RPMLIBDIR@/pkgconfigdeps.sh ] && echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/pkgconfigdeps.sh -R | sort -u +fi + +if [ -n "$LIBTOOLDEP" ]; then # # --- libtooldep deps [ -x @RPMLIBDIR@/libtooldeps.sh ] && |