summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/glew
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-graphics/glew
parent734475b3f86d88a548bc9eb91d836bd1b9335e9f (diff)
downloadopenembedded-core-8579673bdb314dbc554f40fc4c4c1db3d0bb0d63.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. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/glew')
-rw-r--r--meta/recipes-graphics/glew/glew_2.1.0.bb4
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"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}"
# The opengl and egl-XXX options are exclusive, enable only one.
-PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
-PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2"
+PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2"
+PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl"
CFLAGS += "-D_GNU_SOURCE"
# Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess,