kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <cedric@osg.samsung.com>
This commit is contained in:
Conrad Meyer 2015-04-10 11:13:36 +02:00 committed by Cedric BAIL
parent eb7af88ca4
commit d102d07674
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Evas.am
View File

@ -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 = \