diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/glew/glew_2.1.0.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_7.69.0.bb | 4 |
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" | |||
| 22 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" | 22 | PACKAGECONFIG ?= "${@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. |
| 25 | PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" | 25 | PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" |
| 26 | PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" | 26 | PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" |
| 27 | 27 | ||
| 28 | CFLAGS += "-D_GNU_SOURCE" | 28 | CFLAGS += "-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" | |||
| 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 | ||
