mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
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>
This commit is contained in:
parent
1d42de61fa
commit
383fb93e8b
|
|
@ -1,8 +1,6 @@
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 9a507c6c4..3f5b70866 100644
|
|
||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/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_x11'] = True
|
||||||
c_options['use_egl'] = True
|
c_options['use_egl'] = True
|
||||||
else:
|
else:
|
||||||
|
|
@ -22,3 +20,19 @@ index 9a507c6c4..3f5b70866 100644
|
||||||
return flags, base_flags
|
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)
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ export USE_X11
|
||||||
KIVY_GRAPHICS = "gles"
|
KIVY_GRAPHICS = "gles"
|
||||||
export KIVY_GRAPHICS
|
export KIVY_GRAPHICS
|
||||||
|
|
||||||
KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot"
|
KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}"
|
||||||
export KIVY_CROSS_SYSROOT
|
export KIVY_CROSS_SYSROOT
|
||||||
|
|
||||||
DEPENDS += " \
|
DEPENDS += " \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user