Attachment 46450 Details for Bug 36651 – patch configure.ac, Makefiles, etc to check for flex/bison

[patch] patch configure.ac, Makefiles, etc to check for flex/bison

check-for-flex-bison.patch (text/plain), 2.33 KB, created by Brian Paul on 2011-05-08 11:15:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2011-05-08 11:15:45 UTC

Size: 2.33 KB

patch

obsolete

>diff --git a/configs/default b/configs/default
>index 0582a02..b7acfd2 100644
>--- a/configs/default
>+++ b/configs/default
>@@ -38,6 +38,8 @@ MKLIB_OPTIONS =
> MKDEP = makedepend
> MKDEP_OPTIONS = -fdepend
> MAKE = make
>+FLEX = flex
>+BISON = bison
> 
> # Use MINSTALL for installing libraries, INSTALL for everything else
> MINSTALL = $(SHELL) $(TOP)/bin/minstall
>diff --git a/configure.ac b/configure.ac
>index 54d9c29..f8c4237 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -32,6 +32,8 @@ AC_PROG_CC
> AC_PROG_CXX
> AC_CHECK_PROGS([MAKE], [gmake make])
> AC_CHECK_PROGS([PYTHON2], [python2 python])
>+AC_CHECK_PROGS([FLEX], [flex])
>+AC_CHECK_PROGS([BISON], [bison])
> AC_PATH_PROG([MKDEP], [makedepend])
> AC_PATH_PROG([SED], [sed])
> 
>diff --git a/src/glsl/Makefile b/src/glsl/Makefile
>index e4b992d..4100414 100644
>--- a/src/glsl/Makefile
>+++ b/src/glsl/Makefile
>@@ -192,16 +192,16 @@ $(DRICORE_OBJ_DIR)/%.o : %.c
> 	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
> 
> glsl_lexer.cpp: glsl_lexer.ll
>-	flex --nounistd -o$@  $<
>+	$(FLEX) --nounistd -o$@  $<
> 
> glsl_parser.cpp: glsl_parser.yy
>-	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
>+	$(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
> 
> glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
>-	flex --nounistd -o$@  $<
>+	$(FLEX) --nounistd -o$@  $<
> 
> glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
>-	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
>+	$(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<
> 
> builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
> 	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
>diff --git a/src/mesa/Makefile b/src/mesa/Makefile
>index 03962e9..a903a26 100644
>--- a/src/mesa/Makefile
>+++ b/src/mesa/Makefile
>@@ -75,10 +75,10 @@ main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
> 	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
> 
> program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
>-	bison -v -d --output=program/program_parse.tab.c $<
>+	$(BISON) -v -d --output=program/program_parse.tab.c $<
> 
> program/lex.yy.c: program/program_lexer.l
>-	flex --never-interactive --outfile=$@ $<
>+	$(FLEX) --never-interactive --outfile=$@ $<
> 
> ######################################################################
> # Helper libraries used by many drivers:

Actions: View | Splinter Review

Attachments on bug 36651: 46450 | 46650

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.