diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-10-09 07:30:34 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-14 14:27:36 +0200 |
commit | 8a5dc53b66b4ab1b71e96e80dfe7912675fbfb76 (patch) | |
tree | b0f9b625ec7d94127932478630dc462a5231f53f /meta-oe | |
parent | 56ee51ddee4aba3830ed0f1e303e4fc5b628684d (diff) | |
download | meta-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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 1 |
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 c535a416c..fd9264fd0 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() { | |||
80 | oe_runmake 'DESTDIR=${D}' install | 80 | oe_runmake 'DESTDIR=${D}' install |
81 | mv -f ${D}${libdir}/mysql/* ${D}${libdir} | 81 | mv -f ${D}${libdir}/mysql/* ${D}${libdir} |
82 | rmdir ${D}${libdir}/mysql | 82 | rmdir ${D}${libdir}/mysql |
83 | find ${D}${libdir} -name '*.la'|xargs sed -i 's#${libdir}/mysql#${libdir}#' | ||
83 | 84 | ||
84 | install -d ${D}/etc/init.d | 85 | install -d ${D}/etc/init.d |
85 | install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ | 86 | install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ |