[oe-commits] org.oe.dev mono-native 1.2.5.1: fix up mono native compile and make mono depend on it

[henryk commit]

mono-native 1.2.5.1: fix up mono native compile and make mono depend on it

Author: henryk at openmoko.org
Branch: org.openembedded.dev
Revision: 19712eb0308250d072d6e63b1626d4de876ce614
ViewMTN: http://monotone.openembedded.org/revision/info/19712eb0308250d072d6e63b1626d4de876ce614
Files:
1
packages/mono/mono-native_1.2.5.1.bb
packages/mono/mono_1.2.5.1.bb
packages/mono/mono_1.2.5.inc
Diffs:

#
# mt diff -rcc337217bcae73861649768dab4eb72263f400b7 -r19712eb0308250d072d6e63b1626d4de876ce614
#
# 
# 
# patch "packages/mono/mono-native_1.2.5.1.bb"
#  from [09550714c43654e394e25150cf07645f913e0f08]
#    to [161daeba7bb6f373f0acea01b5d4fa973e519bb2]
# 
# patch "packages/mono/mono_1.2.5.1.bb"
#  from [662aece9a44429e4257ddd7f7c659729fe8e0a5e]
#    to [9499f337192480513d8f5e4e93ed53b3fe0f63ff]
# 
# patch "packages/mono/mono_1.2.5.inc"
#  from [d172ec7f8727ea9e7f44a4f85c9eebcb01dc5e63]
#    to [8808de749df7eedf16d945970a3fcee48e0b3925]
# 
============================================================
--- packages/mono/mono-native_1.2.5.1.bb	09550714c43654e394e25150cf07645f913e0f08
+++ packages/mono/mono-native_1.2.5.1.bb	161daeba7bb6f373f0acea01b5d4fa973e519bb2
@@ -1,10 +1,21 @@ require mono_1.2.5.inc
 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
============================================================
--- packages/mono/mono_1.2.5.1.bb	662aece9a44429e4257ddd7f7c659729fe8e0a5e
+++ packages/mono/mono_1.2.5.1.bb	9499f337192480513d8f5e4e93ed53b3fe0f63ff
@@ -1,14 +1,8 @@ require mono_1.2.5.inc
 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/"
 
============================================================
--- packages/mono/mono_1.2.5.inc	d172ec7f8727ea9e7f44a4f85c9eebcb01dc5e63
+++ packages/mono/mono_1.2.5.inc	8808de749df7eedf16d945970a3fcee48e0b3925
@@ -7,7 +7,6 @@ inherit autotools
 S = "${WORKDIR}/mono-${PV}"
 
 inherit autotools
-EXTRA_OECONF = "--disable-mcs-build"
 EXTRA_OECONF_arm = "--without-tls"
 EXTRA_OECONF_mipsel = "--without-tls"