[oe-commits] Marcin Juszkiewicz : mysql: depend on zlib to not build own one

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 675289a6f542c8b0766e72aff92849de012b652b
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=675289a6f542c8b0766e72aff92849de012b652b

Author: Marcin Juszkiewicz <marcin.juszkiewicz at linaro.org>
Date:   Thu May 23 22:19:18 2013 +0000

mysql: depend on zlib to not build own one

When mysql does not detect zlib during configure then their copy of
zlib 1.2.3 is built. That leads to problems during rootfs creation:

|  * check_data_file_clashes: Package libz-staticdev wants to install file /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/work/genericarmv8-oe-linux/linaro-image-lamp/1.0-r0/rootfs/usr/lib/libz.a
|       But that file is already provided by package  * libmysqlclient-staticdev
|  * opkg_install_cmd: Cannot install package libz-staticdev.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz at linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |    2 +-
 1 files changed, 1 insertions(+), 1 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 3d79e19..3b3a42d 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa"
 
-DEPENDS = "ncurses"
+DEPENDS = "ncurses zlib"
 PR = "r11"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \