diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-30 15:53:36 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-31 10:52:22 +0100 |
commit | 351f716ba433c1945cfd6bc105d731cd225dbdb0 (patch) | |
tree | 82374bbc29716d9e17a04a97b3deb790428fc44c | |
parent | c136cc1d3a397e527dffcaf8731ccedc0c8d0f0c (diff) | |
download | meta-openembedded-351f716ba433c1945cfd6bc105d731cd225dbdb0.tar.gz |
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 <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 2 | ||||
-rw-r--r-- | 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 e8382e285..15605d0e2 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 | |||
2 | inherit native | 2 | inherit native |
3 | 3 | ||
4 | PROVIDES += "mysql5-native" | 4 | PROVIDES += "mysql5-native" |
5 | DEPENDS = "ncurses-native zlib-native" | ||
5 | 6 | ||
6 | RDEPENDS_${PN} = "" | 7 | RDEPENDS_${PN} = "" |
7 | PACKAGES = "" | 8 | 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 fc499d434..6ad1fe68a 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 @@ | |||
1 | require ${PN}_${PV}.inc | 1 | require ${PN}_${PV}.inc |
2 | 2 | ||
3 | DEPENDS += "mariadb-native" | 3 | DEPENDS += "mariadb-native ncurses zlib" |
4 | 4 | ||
5 | PROVIDES += "mysql5" | 5 | PROVIDES += "mysql5" |
6 | 6 | ||
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 e66f21544..7cedd9e41 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" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
6 | 6 | ||
7 | DEPENDS = "ncurses zlib" | ||
8 | |||
9 | SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x86/mariadb-${PV}.tar.gz \ | 7 | SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x86/mariadb-${PV}.tar.gz \ |
10 | file://configure.in.patch \ | 8 | file://configure.in.patch \ |
11 | file://plug.in.patch \ | 9 | file://plug.in.patch \ |