mono: make mono-native buildable not only on ARM

3 files changed, 19 insertions, 18 deletions

diff --git a/packages/mono/mono-native_1.2.2.1.bb b/packages/mono/mono-native_1.2.2.1.bb
index 01b795f03e..67651ae565 100644
--- a/packages/mono/mono-native_1.2.2.1.bb
+++ b/packages/mono/mono-native_1.2.2.1.bb
@@ -1,6 +1,4 @@
-require mono_${PV}.bb
-
-S = "${WORKDIR}/mono-${PV}"
+require mono.inc
 
 DEPENDS = "glib-2.0-native"
 
diff --git a/packages/mono/mono.inc b/packages/mono/mono.inc
new file mode 100644
index 0000000000..444427ea4a
--- /dev/null
+++ b/packages/mono/mono.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.gz \
+           file://cpu-arm.h"
+
+S = "${WORKDIR}/mono-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-mcs-build"
+EXTRA_OECONF_arm = "--without-tls"
+
+do_compile_prepend() {
+        cp ${WORKDIR}/cpu-arm.h ${S}/mono/mini/
+}
diff --git a/packages/mono/mono_1.2.2.1.bb b/packages/mono/mono_1.2.2.1.bb
index f786001627..57230e8426 100644
--- a/packages/mono/mono_1.2.2.1.bb
+++ b/packages/mono/mono_1.2.2.1.bb
@@ -1,19 +1,5 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
+require mono.inc
 DEPENDS = "mono-native glib-2.0"
 
 #We only have a cpu-${arch}.h from arm, so let's mask out non-working architectures
 COMPATIBLE_HOST = "arm.*-linux"
-
-SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.gz \
-           file://cpu-arm.h"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-mcs-build"
-EXTRA_OECONF_arm = "--without-tls"
-
-do_compile_prepend() {
-        cp ${WORKDIR}/cpu-arm.h ${S}/mono/mini/
-}