diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-12-10 17:35:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-12 12:46:08 +0000 |
commit | 4a315d597f5f4c6aba7174c69e5c3608f221b6fa (patch) | |
tree | a77edc7c36b2e06a25e9ca3803c00566d6414400 /meta/recipes-support | |
parent | 48f7290a8e4a7cbee5d1571ac712fe81c18b1d4b (diff) | |
download | poky-4a315d597f5f4c6aba7174c69e5c3608f221b6fa.tar.gz |
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 <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/curl/curl_7.69.0.bb | 4 |
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" | |||
20 | PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" | 20 | PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" |
21 | 21 | ||
22 | # 'ares' and 'threaded-resolver' are mutually exclusive | 22 | # 'ares' and 'threaded-resolver' are mutually exclusive |
23 | PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" | 23 | PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" |
24 | PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" | 24 | PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" |
25 | PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" | 25 | PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" |
26 | PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," | 26 | PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," |
@@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss | |||
45 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" | 45 | PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" |
46 | PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," | 46 | PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," |
47 | PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," | 47 | PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," |
48 | PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" | 48 | PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" |
49 | PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" | 49 | PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" |
50 | PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" | 50 | PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" |
51 | 51 | ||