From 351f716ba433c1945cfd6bc105d731cd225dbdb0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Dec 2013 15:53:36 +0100 Subject: [PATCH] mariadb-native: fix dependencies * unlike BBCLASSEXTENDed native support, dependencies in mariadb-native don't get automatic -native suffix, so mariadb-native was depending on target ncurses and zlib. * move the dependency from .inc and apply it with right suffix Signed-off-by: Martin Jansa --- meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 1 + meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 2 +- meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index e8382e285f..15605d0e2d 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb @@ -2,6 +2,7 @@ require mariadb_${PV}.inc inherit native PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native" RDEPENDS_${PN} = "" PACKAGES = "" diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb index fc499d434b..6ad1fe68aa 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb @@ -1,6 +1,6 @@ require ${PN}_${PV}.inc -DEPENDS += "mariadb-native" +DEPENDS += "mariadb-native ncurses zlib" PROVIDES += "mysql5" 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 e66f215443..7cedd9e41d 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc @@ -4,8 +4,6 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "ncurses zlib" - SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x86/mariadb-${PV}.tar.gz \ file://configure.in.patch \ file://plug.in.patch \