KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: glcpp: fix abuse of yylex 

Port the 'glcpp: fix abuse of yylex' commit to Android.mk
Also, since the Android.*.mk are sourced in a global namespace,
the local-y-to-c-and-h is prefixed with the LOCAL_MODULE name,

The initial fix commit is 53d46bc787

There's also a bugzilla for this: 54947

Signed-off-by: Negreanu Marius Adrian <adrian.m.negreanu@intel.com>
Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Negreanu Marius Adrian 2012-09-28 17:36:40 +03:00 committed by Oliver McFadden
parent 523c015246
commit e00abb00f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/glsl/Android.gen.mk
View File

@ -52,10 +52,10 @@ define local-l-or-ll-to-c-or-cpp
$(hide) $(LEX) --nounistd -o$@ $<
endef
define local-y-to-c-and-h
define glsl_local-y-to-c-and-h
@mkdir -p $(dir $@)
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
$(hide) $(YACC) -o $@ $<
$(hide) $(YACC) -o $@ -p "glcpp_parser_" $<
endef
define local-yy-to-cpp-and-h
@ -80,7 +80,7 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l
$(call local-l-or-ll-to-c-or-cpp)
$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y
$(call local-y-to-c-and-h)
$(call glsl_local-y-to-c-and-h)
BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX)

6
src/mesa/Android.gen.mk
View File

@ -75,10 +75,10 @@ define local-l-to-c
$(hide) $(LEX) -o$@ $<
endef
define local-y-to-c-and-h
define mesa_local-y-to-c-and-h
@mkdir -p $(dir $@)
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
$(hide) $(YACC) -o $@ $<
$(hide) $(YACC) -o $@ -p "_mesa_program_" $<
endef
define es-gen
@ -104,7 +104,7 @@ $(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps)
$(call es-gen, -c $*)
$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
$(local-y-to-c-and-h)
$(mesa_local-y-to-c-and-h)
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l
$(local-l-to-c)