From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 11 Nov 2009 21:38:47 +0000 (+0000)
Subject: mysql5: Fix class ordering problem by converting to use SYSROOT_PREPROCESS_FUNCS
X-Git-Tag: Release-2010-05/1~1728^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2abd65b42088b2c5cbbc6fb5f13a56415e59d4f;p=openembedded.git

mysql5: Fix class ordering problem by converting to use SYSROOT_PREPROCESS_FUNCS

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc
index aa69831397..28716747e6 100644
--- a/recipes/mysql/mysql5_5.1.40.inc
+++ b/recipes/mysql/mysql5_5.1.40.inc
@@ -41,7 +41,10 @@ do_stage() {
 	oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR}
 }
 
-do_stage_append() {
+SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
+
+# We need to append this so it runs *after* binconfig's preprocess function
+mysql5_sysroot_preprocess () {
 	sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config
 	sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config
 }