diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-06-16 20:08:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-18 13:24:58 +0100 |
commit | 79e4de84063cdd3d8eab65ae93d9c896829212e8 (patch) | |
tree | 215ff9e216b02a672eddb0d0708c370f77805e9f /meta/recipes-core | |
parent | 0529f93440b2d67af8b2272b4d18220ae94e91d8 (diff) | |
download | poky-79e4de84063cdd3d8eab65ae93d9c896829212e8.tar.gz |
recipes: replace CONFLICTS with RCONFLICTS_${PN}
(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.18.1.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 253ea43851..7dd884449d 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb | |||
@@ -5,12 +5,12 @@ SECTION = "libs" | |||
5 | LICENSE = "GPLv3+ & LGPL-2.1+" | 5 | LICENSE = "GPLv3+ & LGPL-2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | PR = "r13" | 8 | PR = "r14" |
9 | DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" | 9 | DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" |
10 | DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" | 10 | DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" |
11 | PROVIDES = "virtual/libintl virtual/gettext" | 11 | PROVIDES = "virtual/libintl virtual/gettext" |
12 | PROVIDES_virtclass-native = "virtual/gettext-native" | 12 | PROVIDES_virtclass-native = "virtual/gettext-native" |
13 | CONFLICTS_${PN} = "proxy-libintl" | 13 | RCONFLICTS_${PN} = "proxy-libintl" |
14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
15 | file://parallel.patch \ | 15 | file://parallel.patch \ |
16 | " | 16 | " |