aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-10-09 07:30:34 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-14 14:27:36 +0200
commit8a5dc53b66b4ab1b71e96e80dfe7912675fbfb76 (patch)
treeb0f9b625ec7d94127932478630dc462a5231f53f
parent56ee51ddee4aba3830ed0f1e303e4fc5b628684d (diff)
downloadmeta-openembedded-8a5dc53b66b4ab1b71e96e80dfe7912675fbfb76.tar.gz
mariadb: update libdir for libtool
In mariadb recipe,do_install move all the lib files from usr/lib/mysql to usr/lib,but didn't change libdir value in *.la libtool file. This will cause libtool can't get correct lib path of mysql when other package need mysql lib.So update them to correct value. Here is a exapmle: In libmysqlclient.la file: libdir = "/usr/lib/mysq/", but in fact libmysqclient.so is installed into "/usr/lib", this will cause libtool can not find correct lib file with libmysqlclient.la, then libtool will use rpath option to reference a absolute path, and this will cause rpath WARING and rpm error. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.1.67.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
index c535a416cd..fd9264fd05 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
@@ -80,6 +80,7 @@ do_install() {
oe_runmake 'DESTDIR=${D}' install
mv -f ${D}${libdir}/mysql/* ${D}${libdir}
rmdir ${D}${libdir}/mysql
+ find ${D}${libdir} -name '*.la'|xargs sed -i 's#${libdir}/mysql#${libdir}#'
install -d ${D}/etc/init.d
install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/