X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2Fmono-find-requires.in;h=5e0ef2f1cfd35e650d84d380c553d3d108a48dc0;hb=e3685c4c9aad38851097cff877dc0fb7ed47ab10;hp=02deeeef7e32ea7125846656e8c7e75a304ff529;hpb=c16adb8ea455cc32fe64e0063327337952ede527;p=mono.git

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index 02deeeef7e3..5e0ef2f1cfd 100644
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -4,10 +4,13 @@
 #
 # Authors:
 #       Ben Maurer (bmaurer@ximian.com)
+#       Wade Berrier (wberrier@novell.com)
 #
-# (C) 2005 Novell (http://www.novell.com)
+# (C) 2008 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)\$"))
@@ -20,11 +23,14 @@ configlist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.config\$"))
 # Set the prefix, unless it is overriden (used when building mono rpms)
 : ${prefix=@prefix@}
 
+# Can override .config scanning if specified
+: ${IGNORE_CONFIG_SCAN=0}
+
 libdir=$prefix/@reloc_libdir@
 bindir=$prefix/bin
 
 # Bail out if monodis or libmono is missing
-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
 	echo "monodis missing or unusable, exiting..." 1>&2
 	exit 1
 fi
@@ -33,11 +39,20 @@ fi
 if test "x@reloc_libdir@" = "xlib64" ; then
         libext="()(64bit)"
 else
+	# (note, this works on ppc64 since we only have 32bit mono)
         libext=""
 fi
 
-# set LD_LIBRARY_PATH to ensure that libmono.so is found
+# Exceptions:
+case `uname -m` in
+	# ia64 doesn't use lib64 for 'libdir' (sles 9 rpm used to provide both... no longer)
+	ia64)	libext="()(64bit)" ;;
+esac
+
+# set LD_LIBRARY_PATH to ensure that libmono is found
 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
 
 REQUIRES=$(
 	for i in "${monolist[@]}"; do
@@ -62,6 +77,11 @@ REQUIRES=$(
 			}
 		    ') 2> /dev/null
 	done
+)
+
+if [ $IGNORE_CONFIG_SCAN -eq 0 ] ; then
+
+rpm_config_REQUIRES=$(
 	# Parse the xml .config files to see what native binaries we call into
 	# TODO: also check monodis --moduleref
 	for i in "${configlist[@]}"; do
@@ -69,7 +89,9 @@ REQUIRES=$(
 			ignore=0
 			req=""
 			split($_, toks, "\"")
-			for(i=1; i <= length(toks); i++) {
+			toks_size=0
+                        for(tok in toks) { toks_size++ }
+			for(i=1; i <= toks_size; i++) {
 				if(toks[i] ~ /target=/) {
 					req=toks[i+1]
 				}
@@ -84,7 +106,9 @@ REQUIRES=$(
 					}
 
 					split(attr, os_targets, ",")
-					for(j=1; j <= length(os_targets); j++) {
+					os_targets_size=0
+                                        for(os_target in os_targets) { os_targets_size++ }
+					for(j=1; j <= os_targets_size; j++) {
 						if(os_targets[j] == "linux") {
 							found=1
 						}
@@ -99,12 +123,38 @@ REQUIRES=$(
 				}
 			}
 			if(!ignore) {
-				system("rpm -q --whatprovides --queryformat \"%{NAME}\n\" ""\""req"'$libext'""\"")
+				print req"'$libext'"
 			}
 		} ' $i 2>/dev/null
 	done
 )
 
+# Resolve provides to packages, warning on missing to stderr
+config_REQUIRES=$(
+	first=1 # avoid an empty line if no .config reqs are found
+	for i in ${rpm_config_REQUIRES[@]} ; do
+		out=$(rpm -q --whatprovides --queryformat "%{NAME}\n" $i)
+		if [ $? -eq 0 ] ; then
+			if [ $first -eq 1 ] ; then
+			       echo ""
+			       first=0
+			fi
+			echo $out
+		else
+			# echo to stderr
+			echo "mono-find-requires: Warning, could not find package that provides: $i" >&2
+		fi
+	done
+)
+
+fi
+
+# Note about above:
+#  Use to do: system("rpm -q --whatprovides --queryformat \"%{NAME}\n\" ""\""req"'$libext'""\"")
+#  rpmlint prefers to have lib names instead of package names.  There was a reason I was using package names but it slips me now...
+#  Ah... now I remember... it's for noarch packs.  The noarch packages can be built on either 32 or 64 bit... so we have to depend
+#   on the package name instead.
+
 PROVIDES=$(
 	for i in "${monolist[@]}"; do
 		($bindir/monodis --assembly $i | awk '
@@ -123,9 +173,10 @@ PROVIDES=$(
 # in PROVIDES. While RPM functions correctly when such deps exist,
 # they make the metadata a bit bloated.
 #
+# TODO: make this use the mono-find-provides script, to share code
 
 # Filter out dups from both lists
-REQUIRES=$(echo "$REQUIRES" | sort | uniq)
+REQUIRES=$(echo "$REQUIRES $config_REQUIRES"  | sort | uniq)
 PROVIDES=$(echo "$PROVIDES" | sort | uniq)
 
 #