projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5714 from alexischr/update_bockbuild
[mono.git]
/
scripts
/
mono-find-provides.in
diff --git
a/scripts/mono-find-provides.in
b/scripts/mono-find-provides.in
index ff649639f470058ee2bcea531f410a34865751c4..5b2e20602d5aa6ba0ab18adfd64134432ece4fb2 100644
(file)
--- a/
scripts/mono-find-provides.in
+++ b/
scripts/mono-find-provides.in
@@
-8,6
+8,8
@@
# (C) 2005 Novell (http://www.novell.com)
#
# (C) 2005 Novell (http://www.novell.com)
#
+if [ -n "$DISABLE_MONO_RPM_AUTO_DEPS" ]; then exit 0; fi
+
IFS=$'\n'
filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
IFS=$'\n'
filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
@@
-15,23
+17,25
@@
monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
# Only include files with /gac/ in path
# (Allows packages to contain private assemblies that don't conflict with other packages)
monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
# Only include files with /gac/ in path
# (Allows packages to contain private assemblies that don't conflict with other packages)
monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
-
-a=`which "$0"`
-d=`dirname "$a"`
+# Disabled... see ChangeLog
# Set the prefix, unless it is overriden (used when building mono rpms)
# Set the prefix, unless it is overriden (used when building mono rpms)
-: ${prefix=
$d/..
}
+: ${prefix=
@prefix@
}
-exec_prefix=$d/..
libdir=$prefix/@reloc_libdir@
libdir=$prefix/@reloc_libdir@
-bindir=$
d
+bindir=$
prefix/bin
-[ -x $bindir/monodis ] || exit 0;
-[ -f $libdir/libmono.so ] || exit 0;
+# Bail out if monodis or libmono is missing
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
+ echo "monodis missing or unusable, exiting..." 1>&2
+ exit 1
+fi
-# set LD_LIBRARY_PATH to ensure that libmono
.so
is found
+# set LD_LIBRARY_PATH to ensure that libmono is found
export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+# and set MONO_PATH to ensure that mscorlib.dll can be found
+export MONO_PATH=$prefix/lib/mono/4.5
for i in "${monolist[@]}"; do
($bindir/monodis --assembly $i | awk '
for i in "${monolist[@]}"; do
($bindir/monodis --assembly $i | awk '