diff options
| author | Henryk Ploetz <henryk@openmoko.org> | 2007-09-27 20:24:22 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2007-09-27 20:24:22 +0000 |
| commit | 0179b6da643c30c5298bf880ced8cbb4a3bd57d0 (patch) | |
| tree | 630050eb455659a0afd60da29b9842f4271989f1 | |
| parent | 64079a44f7fce4283b875dbefbf76f2970a3b21c (diff) | |
mono-native 1.2.5.1: fix up mono native compile and make mono depend on it
| -rw-r--r-- | packages/mono/mono-native_1.2.5.1.bb | 13 | ||||
| -rw-r--r-- | packages/mono/mono_1.2.5.1.bb | 12 | ||||
| -rw-r--r-- | packages/mono/mono_1.2.5.inc | 1 |
3 files changed, 16 insertions, 10 deletions
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb index 2670d3fb55..09223ddcab 100644 --- a/packages/mono/mono-native_1.2.5.1.bb +++ b/packages/mono/mono-native_1.2.5.1.bb @@ -1,10 +1,21 @@ require mono_1.2.5.inc -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0-native" +SRC_URI += "file://mono-fix-libdir-path.patch;patch=1" + inherit native #do_stage_prepend() { # install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} #} +do_fix_libtool_name() { + # inherit native will make that all native tools that are being + # built are prefixed with something like "i686-linux-", + # including libtool. Fix up some hardcoded libtool names: + for i in "${S}"/runtime/*-wrapper.in; do + sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}" + done +} +addtask fix_libtool_name after do_patch before do_configure diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index c0a4cfb223..e1f3f1b6a5 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -1,14 +1,8 @@ require mono_1.2.5.inc -#DEPENDS = "mono-native glib-2.0" -# for now, we skip the mono-native build -- just install -# mono using your distro package manager for now -# after we get the target version working, we'll worry -# about the native package for systems that don't have mono -# installed -DEPENDS = "glib-2.0" +DEPENDS = "mono-native glib-2.0" -PR = "r0" +PR = "r1" SRC_URI += "file://configure.patch;patch=1" @@ -17,6 +11,8 @@ do_install_append() { cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ } +EXTRA_OECONF += " --disable-mcs-build " + PACKAGES =+ "mono-dll" FILES_mono-dll = "${libdir}/mono/1.0/" diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc index 5164b05e2d..aeca713d6b 100644 --- a/packages/mono/mono_1.2.5.inc +++ b/packages/mono/mono_1.2.5.inc @@ -7,7 +7,6 @@ SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2" S = "${WORKDIR}/mono-${PV}" inherit autotools -EXTRA_OECONF = "--disable-mcs-build" EXTRA_OECONF_arm = "--without-tls" EXTRA_OECONF_mipsel = "--without-tls" |