mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-01 01:30:23 +00:00
Code Issues Projects Releases Wiki Activity

mysql: always replace paths in mysql_config script

Browse Source 
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 <jslater@windriver.com>.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Paul Eggleton
2012-10-23 09:17:08 +00:00
committed by Koen Kooi
parent 5febf70d37
commit 415c49a0c7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+7 -3
View File
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa"
DEPENDS = "ncurses" DEPENDS = "ncurses"
PR = "r9" PR = "r10"
SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
file://configure.in.patch \ file://configure.in.patch \
@@ -41,9 +41,13 @@ do_configure_append() {
SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
# We need to append this so it runs *after* binconfig's preprocess function # 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 () { mysql5_sysroot_preprocess () {
sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config sed -i -es,^pkgincludedir=.*,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,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
} }
do_install() { do_install() {