summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-02-07 08:53:08 +0000
committerKoen Kooi <koen@openembedded.org>2007-02-07 08:53:08 +0000
commit811260be4d7df7424f1827410116378929d50da3 (patch)
treec7fe8fea599972a795350dc54601e883293fc5a5 /packages
parent5ce1e1ca759bcf7ed95dc1ebb2686a6e2210e790 (diff)
parent998bff3949f3b98a566294c9c081d2845ea864c5 (diff)
merge of '4b9a0b16383fa2823e6bb13e422ef8a64dbe7c2f'
and '762e8a2920e077c45276e50d912c9125531a98d7'
Diffstat (limited to 'packages')
-rw-r--r--packages/mono/mono-native_1.2.2.1.bb4
-rw-r--r--packages/mono/mono.inc17
-rw-r--r--packages/mono/mono_1.2.2.1.bb16
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 e0b954543b..7d7134e2b2 100644
--- a/packages/mono/mono_1.2.2.1.bb
+++ b/packages/mono/mono_1.2.2.1.bb
@@ -1,6 +1,4 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
+require mono.inc
DEPENDS = "mono-native glib-2.0"
PR = "r1"
@@ -8,18 +6,6 @@ PR = "r1"
#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/
-}
-
do_install_append() {
install -d ${D}${libdir}/mono/1.0/
cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/