summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-12-10 17:35:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-11 13:44:04 +0000
commit8579673bdb314dbc554f40fc4c4c1db3d0bb0d63 (patch)
tree53a8a0131758933d521829a659240f9c39b04c09 /meta/recipes-support/curl
parent734475b3f86d88a548bc9eb91d836bd1b9335e9f (diff)
downloadopenembedded-core-8579673bdb314dbc554f40fc4c4c1db3d0bb0d63.tar.gz
openembedded-core-8579673bdb314dbc554f40fc4c4c1db3d0bb0d63.tar.bz2
openembedded-core-8579673bdb314dbc554f40fc4c4c1db3d0bb0d63.zip
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. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl_7.69.0.bb4
1 files changed, 2 insertions, 2 deletions
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"