[oe-commits] Koen Kooi : mysql: adopt to new style sysroot stuff

git version control git at git.openembedded.org
Wed Nov 11 16:35:35 UTC 2009


Module: openembedded.git
Branch: shr/merge
Commit: d3d76c149b8fba3d1ef6d803d7a3b6fcfca58b2f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d3d76c149b8fba3d1ef6d803d7a3b6fcfca58b2f

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Nov 11 16:24:35 2009 +0100

mysql: adopt to new style sysroot stuff

---

 recipes/mysql/mysql_4.1.22.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index 9e5ff88..1dacff6 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -38,9 +38,11 @@ do_stage() {
 	oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR}
 }
 
-do_stage_append() {
-	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
+SYSROOT_PREPROCESS_FUNCS += "mysqlmangle"
+
+mysqlmangle() {
+	sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
+	sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
 }
 
 do_install() {





More information about the Openembedded-commits mailing list