From 33be8727b8861a09fe0814d8146733358f637b66 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 23 May 2013 22:19:18 +0000 Subject: [PATCH] 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. (From meta-openembedded rev: 675289a6f542c8b0766e72aff92849de012b652b) Signed-off-by: Marcin Juszkiewicz Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-openembedded/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-openembedded/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 3d79e19..3b3a42d 100644 --- a/meta-openembedded/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-openembedded/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 \ -- 2.7.4