mariadb: fix do_configure failed while multilib is used
authorHongxu Jia <hongxu.jia@windriver.com>
Thu, 10 Oct 2013 07:47:38 +0000 (07:47 +0000)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:33:51 +0000 (08:33 -0800)
commit848b7f70d35f6c3d3b0632df62b2f68ff3dd4ac3
tree0d35f5272456f0f6deec0170e06eba5bec806c84
parenta4913b5232b0c066c1908720e49ae57cf6cd96bc
mariadb: fix do_configure failed while multilib is used

Here is the error log from mariadb's configure test
...
 checking for zlib compression library... configure: error: headers or
binaries were not found in /home/jiahongxu/yocto/build-20131009-mysql/
bitbake_build/tmp/sysroots/qemux86-64/usr/{include,lib}
...

When multilib is used, the baselib is assigned with "lib64", here is
the log from 'bitbake mariadb -e'
...
 4738 # $baselib [3 operations]
 4739 #   set conf/bitbake.conf:10
 4740 #     "${BASELIB}"
 4741 #   set conf/bitbake.conf:11
 4742 #     [vardepvalue] "${baselib}"
 4743 #   set /home/jiahongxu/yocto/build-20131009-mysql/layers/oe-core/meta/conf/multilib.conf:2
 4744 #     "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}"
 4745 # computed:
 4746 #   "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}"
 4747 baselib="lib64"
...

In this situation, the zlib locates in 'lib64' rather than 'lib'.
But mariadb's confiure test still searches zlib in 'lib'.

Modify mariadb's confiure to let lib dir configurable rather
than hardcode could fix this issue.

(From meta-openembedded rev: a0a4037cf2ed2dee6a4e1ff44a84a73babb52019)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-oe/recipes-support/mysql/mariadb/zlib-let-libdir-configurable.patch [new file with mode: 0644]
meta-openembedded/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc