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-graphics | |
| 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-graphics')
| -rw-r--r-- | meta/recipes-graphics/glew/glew_2.1.0.bb | 4 |
1 files changed, 2 insertions, 2 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, |