From 4a315d597f5f4c6aba7174c69e5c3608f221b6fa Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 10 Dec 2019 17:35:35 +0800 Subject: glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. (From OE-Core rev: 8579673bdb314dbc554f40fc4c4c1db3d0bb0d63) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.69.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/curl/curl_7.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc53f..2e9b5125fe 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- cgit v1.2.3-54-g00ecf