summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-11 21:38:47 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-11 21:38:47 +0000
commita2abd65b42088b2c5cbbc6fb5f13a56415e59d4f (patch)
tree21135754414b7b79c3dcf19e80dc9623b6448f62
parentdc3d69b22b6b2a8906dc80ff0b2421ef2d429d71 (diff)
mysql5: Fix class ordering problem by converting to use SYSROOT_PREPROCESS_FUNCS
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--recipes/mysql/mysql5_5.1.40.inc5
1 files changed, 4 insertions, 1 deletions
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
}