summaryrefslogtreecommitdiffstats
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-12 12:46:08 +0000
commit4a315d597f5f4c6aba7174c69e5c3608f221b6fa (patch)
treea77edc7c36b2e06a25e9ca3803c00566d6414400
parent48f7290a8e4a7cbee5d1571ac712fe81c18b1d4b (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/glew/glew_2.1.0.bb4
-rw-r--r--meta/recipes-support/curl/curl_7.69.0.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb
index f6f43406f8..edcbdc0a7a 100644
--- a/meta/recipes-graphics/glew/glew_2.1.0.bb
+++ b/meta/recipes-graphics/glew/glew_2.1.0.bb
@@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
22PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" 22PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}"
23 23
24# The opengl and egl-XXX options are exclusive, enable only one. 24# The opengl and egl-XXX options are exclusive, enable only one.
25PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" 25PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2"
26PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" 26PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl"
27 27
28CFLAGS += "-D_GNU_SOURCE" 28CFLAGS += "-D_GNU_SOURCE"
29# Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, 29# Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess,
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"
20PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" 20PACKAGECONFIG_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
23PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" 23PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"
24PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" 24PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli"
25PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" 25PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual"
26PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," 26PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
@@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
45PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" 45PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss"
46PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," 46PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
47PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," 47PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
48PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" 48PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares"
49PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" 49PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
50PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" 50PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
51 51