glmark2: depend on host-python
PATCH v2 1/1 glmark2: depend on host-python
The waf build system of glmark2 needs Python 2 as stated on its README file:
python 2.x (>= 2.4) for the build system (waf)
Building it with a system with Python 3 as the default Python version will result on a failure like this one:
File "waflib/Utils.py", line 199
except OSError ,e:
^
SyntaxError: invalid syntax
So, in order to fix this, make this package depending on host-python and also run the waf script using $(HOST_DIR)/usr/bin/python2.
At the same time delete 3 Python environment variables passed to the waf script during the configure phase which it seems there aren't needed for anything.
Fixes:
http://autobuild.buildroot.net/results/fc6/fc6cd2a90bbb0e6f80f6c4afaae1430f82e54046/
---
Changes v1 -> v2:
- Delete the 3 Python environment variables that are passed to the waf script during the configure phase, as it seems they aren't needed for anything. (Suggested by Thomas Petazzoni)
package/glmark2/glmark2.mk | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
package/glmark2/glmark2.mk +4 -7
@@ -8,7 +8,7 @@ GLMARK2_VERSION = 499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPLv3+ SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI -GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \ +GLMARK2_DEPENDENCIES = host-pkgconf host-python jpeg libpng \ $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \ $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
@@ -47,21 +47,18 @@ GLMARK2_CONF_OPTS += \ define GLMARK2_CONFIGURE_CMDS (cd $(@D); \ - PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python-config" \ - python_LDFLAGS="" \ - python_LIBDIR="" \ $(TARGET_CONFIGURE_OPTS) \ $(GLMARK2_CONF_ENV) \ - ./waf configure $(GLMARK2_CONF_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf configure $(GLMARK2_CONF_OPTS) \ ) endef define GLMARK2_BUILD_CMDS - cd $(@D) && $(TARGET_MAKE_ENV) ./waf + cd $(@D) && $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/python2 ./waf endef define GLMARK2_INSTALL_TARGET_CMDS - cd $(@D) && $(TARGET_MAKE_ENV) ./waf install --destdir=$(TARGET_DIR) + cd $(@D) && $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/python2 ./waf install --destdir=$(TARGET_DIR) endef $(eval $(generic-package))
Signature · 1 line
1.7.1
PATCH v2 1/1 glmark2: depend on host-python
Dear Vicente Olivert Riera,
Quoted 22 lines · Vicente Olivert Riera
The waf build system of glmark2 needs Python 2 as stated on its README file:
python 2.x (>= 2.4) for the build system (waf)
Building it with a system with Python 3 as the default Python version will result on a failure like this one:
File "
waflib/Utils.py", line 199
except OSError ,e:
^
SyntaxError: invalid syntaxSo, in order to fix this, make this package depending on host-python and also run the waf script using $(HOST_DIR)/usr/bin/python2.
At the same time delete 3 Python environment variables passed to the waf script during the configure phase which it seems there aren't needed for anything.
Fixes:
Quoted 8 lines
http://autobuild.buildroot.net/results/fc6/fc6cd2a90bbb0e6f80f6c4afaae1430f82e54046/
Signed-off-by Vicente Olivert Riera <[email protected]>---
Changes v1 -> v2:
- Delete the 3 Python environment variables that are passed to the waf script during the configure phase, as it seems they aren't needed for anything. (Suggested by Thomas Petazzoni)
Applied, thanks. Let's see what happens in the autobuilders :-)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com