diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-23 09:17:08 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-10-24 08:28:12 +0200 |
| commit | 415c49a0c7ba008ed26f6639dd57a96fa9b986e1 (patch) | |
| tree | 186ebe276ce071d117c182566aa8978717bb06ed /meta-oe/recipes-support/mysql | |
| parent | 5febf70d37c7e9cf55fa7de5285531a810312e3a (diff) | |
| download | meta-openembedded-contrib-415c49a0c7ba008ed26f6639dd57a96fa9b986e1.tar.gz | |
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 <jslater@windriver.com>.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 72e9ef8799..3867a12467 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -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() { |