Skip to contentSkip to conversation

mysql: always replace paths in mysql_config script

PATCH New Paul Eggleton 1 participant 1 message Oct 23, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mysql: always replace paths in mysql_config script

Path replacement was not happening on some machines if the MySQL build scripts set a different path in the produced mysql_config script, resulting in host paths being left in.

Original patch by Joe Slater <[email protected]>.

---
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +7 -3
index 72e9ef8..3867a12 100644
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa"
 
 DEPENDS = "ncurses"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
            file://configure.in.patch \
@@ -41,9 +41,13 @@ do_configure_append() {
 SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
 
 # We need to append this so it runs *after* binconfig's preprocess function
+#
+# We really don't care exactly what the directories were set to originally.
+# plugindir is not fixed, but we don't create any plugins.
+#
 mysql5_sysroot_preprocess () {
-	sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
-	sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
+	sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
+	sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
 }
 
 do_install() {
Signature · 1 line
1.7.9.5