aboutsummaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-09-04 10:37:19 -0700
committerKhem Raj <raj.khem@gmail.com>2021-09-07 10:02:11 -0700
commit383fb93e8bc8fea089d2f3c47e264e63bb103f9a (patch)
tree1738c78907b932330b9a63ebe558f24c1ad89dff /meta-python
parent1d42de61facdb19eacc36af18d4c2014bbd0d4e4 (diff)
downloadmeta-openembedded-383fb93e8bc8fea089d2f3c47e264e63bb103f9a.tar.gz
meta-openembedded-383fb93e8bc8fea089d2f3c47e264e63bb103f9a.tar.bz2
meta-openembedded-383fb93e8bc8fea089d2f3c47e264e63bb103f9a.zip
python3-kivy: Remove hardcoded include paths
Use RECIPE_SYSROOT instead of synthesizing the sysroot Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: William Huang <whuang8933@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch20
-rw-r--r--meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb2
2 files changed, 18 insertions, 4 deletions
diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch
index e50c7e7e2..bb236b419 100644
--- a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch
+++ b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch
@@ -1,8 +1,6 @@
-diff --git a/setup.py b/setup.py
-index 9a507c6c4..3f5b70866 100644
--- a/setup.py
+++ b/setup.py
-@@ -680,7 +680,18 @@ def determine_gl_flags():
+@@ -695,7 +695,18 @@ def determine_gl_flags():
c_options['use_x11'] = True
c_options['use_egl'] = True
else:
@@ -22,3 +20,19 @@ index 9a507c6c4..3f5b70866 100644
return flags, base_flags
+@@ -723,14 +734,13 @@ def determine_sdl2():
+ sdl_inc = join(include, 'SDL2')
+ if isdir(sdl_inc):
+ sdl2_paths.append(sdl_inc)
+- sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2'])
+
+ flags['include_dirs'] = sdl2_paths
+ flags['extra_link_args'] = []
+ flags['extra_compile_args'] = []
+ flags['library_dirs'] = (
+ sdl2_paths if sdl2_paths else
+- ['/usr/local/lib/'])
++ [''])
+
+ if sdl2_flags:
+ flags = merge(flags, sdl2_flags)
diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb
index 3f6bafda8..63c2ae733 100644
--- a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb
@@ -39,7 +39,7 @@ export USE_X11
KIVY_GRAPHICS = "gles"
export KIVY_GRAPHICS
-KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot"
+KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}"
export KIVY_CROSS_SYSROOT
DEPENDS += " \