mono 1.2.5.1: patch genmdesc.pl to use cpp from staging instead of host

diff --git a/packages/mono/files/genmdesc-cpp.patch b/packages/mono/files/genmdesc-cpp.patch
new file mode 100644 (file)
index 0000000..56eca8e
--- /dev/null
+++ b/packages/mono/files/genmdesc-cpp.patch
@@ -0,0 +1,22 @@
+--- mono-1.2.5.1/mono/mini/genmdesc.pl.orig    2007-10-03 21:02:07.000000000 +0200
++++ mono-1.2.5.1/mono/mini/genmdesc.pl 2007-10-03 21:06:16.000000000 +0200
+@@ -36,7 +36,9 @@
+               $i++;
+       }
+       close (OPS);
+-      my $cpp = "cpp -undef ";
++      my $cpp = $ENV{"CPP"};
++      $cpp = "cpp" unless defined $cpp;
++      $cpp .= " -undef ";
+       foreach (@defines) {
+               $cpp .= " -U$_";
+               $arch_found = 1 if $arch eq $_;
+@@ -44,7 +46,7 @@
+       die "$arch arch is not supported.\n" unless $arch_found;
+ 
+       $cpp .= " -D$arch $srcdir/mini-ops.h|";
+-      #print "Running: $cpp\n";
++      print "Running: $cpp\n";
+       open (OPS, $cpp) || die "Cannot execute cpp: $!";
+       while (<OPS>) {
+               next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;

diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index 9a3d497..c3ea181 100644 (file)
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -4,7 +4,8 @@ DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
 PR = "r2"
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch;patch=1 \
+       file://genmdesc-cpp.patch;patch=1"
 
 # Per http://www.mono-project.com/Mono:ARM
 EXTRA_OECONF += " --disable-mcs-build "