On Tue, Oct 2, 2012 at 12:16 AM, Oliver McFadden <oliver.mcfad...@linux.intel.com> wrote: > On Fri, Sep 28, 2012 at 05:36:40PM +0300, Negreanu Marius Adrian wrote: >> 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 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a >> >> There's also a bugzilla for this: 54947 >> >> Signed-off-by: Negreanu Marius Adrian <adrian.m.negre...@intel.com> > Reviewed-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> > > Adding Dave Airlie to CC due to his authorship of the original fix > commit. Dave, could you also review?
apart from typo Reviewed-by: Dave Airlie <airl...@redhat.com> > > If Adrian cannot push upstream I'll push on his behalf after review. > >> --- >> src/glsl/Android.gen.mk | 6 +++--- >> src/mesa/Android.gen.mk | 6 +++--- >> 2 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk >> index e4ccb72..2ed9fa6 100644 >> --- a/src/glsl/Android.gen.mk >> +++ b/src/glsl/Android.gen.mk >> @@ -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) >> >> diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk >> index f5e6323..c17df1a 100644 >> --- a/src/mesa/Android.gen.mk >> +++ b/src/mesa/Android.gen.mk >> @@ -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) >> -- >> 1.7.11.3 >> >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev > > -- > Oliver McFadden. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
