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:
parent
523c015246
commit
e00abb00f0
|
@ -52,10 +52,10 @@ define local-l-or-ll-to-c-or-cpp
|
||||||
$(hide) $(LEX) --nounistd -o$@ $<
|
$(hide) $(LEX) --nounistd -o$@ $<
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define local-y-to-c-and-h
|
define glsl_local-y-to-c-and-h
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
|
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
|
||||||
$(hide) $(YACC) -o $@ $<
|
$(hide) $(YACC) -o $@ -p "glcpp_parser_" $<
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define local-yy-to-cpp-and-h
|
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)
|
$(call local-l-or-ll-to-c-or-cpp)
|
||||||
|
|
||||||
$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y
|
$(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)
|
BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX)
|
||||||
|
|
||||||
|
|
|
@ -75,10 +75,10 @@ define local-l-to-c
|
||||||
$(hide) $(LEX) -o$@ $<
|
$(hide) $(LEX) -o$@ $<
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define local-y-to-c-and-h
|
define mesa_local-y-to-c-and-h
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
|
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
|
||||||
$(hide) $(YACC) -o $@ $<
|
$(hide) $(YACC) -o $@ -p "_mesa_program_" $<
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define es-gen
|
define es-gen
|
||||||
|
@ -104,7 +104,7 @@ $(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps)
|
||||||
$(call es-gen, -c $*)
|
$(call es-gen, -c $*)
|
||||||
|
|
||||||
$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
|
$(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
|
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l
|
||||||
$(local-l-to-c)
|
$(local-l-to-c)
|
||||||
|
|
Loading…
Reference in New Issue