[OE-core] [PATCH] flex: fix the DEPENDS setting
Rongqing Li
rongqing.li at windriver.com
Tue Sep 23 07:13:13 UTC 2014
Drop this, I see Christopher Larson' patch has been merged.
commit fce2be6dcf8e7320b7b9df9947745e78fd160815
Author: Christopher Larson <chris_larson at mentor.com>
Date: Tue Sep 16 18:22:02 2014 -0700
flex: fix the deps for ptest builds
Building the tests for flex requires flex-native and bison-native,
but the
attempt to add this dependency was done incorrectly. Use an inline
python
conditional based on PTEST_ENABLED instead.
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
diff --git a/meta/recipes-devtools/flex/flex.inc
b/meta/recipes-devtools/flex/flex.inc
index 54e4ec3..a4a26e2 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -5,6 +5,7 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/"
SECTION = "devel"
LICENSE = "BSD"
+DEPENDS += "${@'bison-native flex-native' if '${PTEST_ENABLED}' == '1'
else ''}"
SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
file://run-ptest \
@@ -28,7 +29,6 @@ do_install_append_class-nativesdk() {
}
RDEPENDS_${PN} += "m4"
-DEPENDS_${PN}-ptest += "bison-native flex-native"
do_compile_ptest() {
for i in `find ${S}/tests/ -type d |grep -Ev
"concatenated-options|reject|table-opts" | awk -F/ '{print $NF}'`; \
-Roy
On 09/16/2014 02:03 PM, rongqing.li at windriver.com wrote:
> From: Roy Li <rongqing.li at windriver.com>
>
> DEPENDS does not support the override, fix it by checking the DISTRO_FEATURE
> with ptest
>
> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> ---
> meta/recipes-devtools/flex/flex.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
> index 54e4ec3..bd12f69 100644
> --- a/meta/recipes-devtools/flex/flex.inc
> +++ b/meta/recipes-devtools/flex/flex.inc
> @@ -28,7 +28,7 @@ do_install_append_class-nativesdk() {
> }
>
> RDEPENDS_${PN} += "m4"
> -DEPENDS_${PN}-ptest += "bison-native flex-native"
> +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'ptest', 'bison-native flex-native', '', d)}"
>
> do_compile_ptest() {
> for i in `find ${S}/tests/ -type d |grep -Ev "concatenated-options|reject|table-opts" | awk -F/ '{print $NF}'`; \
>
--
Best Reagrds,
Roy | RongQing Li
More information about the Openembedded-core
mailing list