From d102d076744654705d59a403aa58afb29932aac8 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Fri, 10 Apr 2015 11:13:36 +0200 Subject: [PATCH] autotools: use bash for gen_shaders*.sh Summary: Fixes src-on-NFS builds on FreeBSD, especially when the current shell is not bash. Test Plan: Before: SHADERS modules/evas/engines/gl_common/shader/evas_gl_shaders.x gmake[4]: modules/evas/engines/gl_common/shader/gen_shaders.sh: Command not found Makefile:34122: recipe for target 'modules/evas/engines/gl_common/shader/evas_gl_shaders.x' failed gmake[4]: *** [modules/evas/engines/gl_common/shader/evas_gl_shaders.x] Error 127 Even manually adjusting path doesn't fix it (and the file is clearly `+x`): $ ls -l src/modules/evas/engines/gl_common/shader/gen_shaders.sh -rwxrwxrwx 1 1000 1000 1848 Apr 8 17:01 src/modules/evas/engines/gl_common/shader/gen_shaders.sh $ export PATH="$PATH:$(pwd)/src" $ modules/evas/engines/gl_common/shader/gen_shaders.sh zsh: no such file or directory: modules/evas/engines/gl_common/shader/gen_shaders.sh After patch: SHADERS modules/evas/engines/gl_common/shader/evas_gl_shaders.x CC modules/evas/engines/software_x11/modules_evas_engines_software_x11_module_la-evas_x_egl.lo CC modules/evas/engines/software_x11/modules_evas_engines_software_x11_module_la-evas_xlib_swapbuf.lo ... Projects: #efl Differential Revision: https://phab.enlightenment.org/D2314 Signed-off-by: Cedric BAIL --- src/Makefile_Evas.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index f3f7603e06..ca5bf93e6b 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -667,7 +667,7 @@ EXTRA_lib_evas_libevas_la_DEPENDENCIES = modules/evas/engines/gl_common/shader/e modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(GL_SHADERS_GEN) @echo " SHADERS $@" - @$(builddir)/modules/evas/engines/gl_common/shader/gen_shaders.sh + @bash $(builddir)/modules/evas/engines/gl_common/shader/gen_shaders.sh modules/evas/engines/gl_common/shader/evas_gl_enum.x: modules/evas/engines/gl_common/shader/evas_gl_shaders.x @@ -700,7 +700,7 @@ modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) @echo " SHADERS $@" - @$^ + @bash $^ GL_GENERIC_SOURCES = \