Update bison to the last version from Linux from Scratch.

Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org

--- config/rootfiles/common/bison | 21 +++++++++++++++++++++ lfs/bison | 12 +++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison index ca8d5ee..2304eca 100644 --- a/config/rootfiles/common/bison +++ b/config/rootfiles/common/bison @@ -8,6 +8,7 @@ #usr/share/bison/bison.m4 #usr/share/bison/c++-skel.m4 #usr/share/bison/c++.m4 +#usr/share/bison/c-like.m4 #usr/share/bison/c-skel.m4 #usr/share/bison/c.m4 #usr/share/bison/glr.c @@ -21,12 +22,32 @@ #usr/share/bison/m4sugar/foreach.m4 #usr/share/bison/m4sugar/m4sugar.m4 #usr/share/bison/stack.hh +#usr/share/bison/variant.hh #usr/share/bison/xslt #usr/share/bison/xslt/bison.xsl #usr/share/bison/xslt/xml2dot.xsl #usr/share/bison/xslt/xml2text.xsl #usr/share/bison/xslt/xml2xhtml.xsl #usr/share/bison/yacc.c +#usr/share/doc/bison-3.0.4 +#usr/share/doc/bison-3.0.4/AUTHORS +#usr/share/doc/bison-3.0.4/COPYING +#usr/share/doc/bison-3.0.4/NEWS +#usr/share/doc/bison-3.0.4/README +#usr/share/doc/bison-3.0.4/THANKS +#usr/share/doc/bison-3.0.4/TODO +#usr/share/doc/bison-3.0.4/examples +#usr/share/doc/bison-3.0.4/examples/calc++ +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.cc +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.hh +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-parser.yy +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-scanner.ll +#usr/share/doc/bison-3.0.4/examples/calc++/calc++.cc +#usr/share/doc/bison-3.0.4/examples/mfcalc +#usr/share/doc/bison-3.0.4/examples/mfcalc/calc.h +#usr/share/doc/bison-3.0.4/examples/mfcalc/mfcalc.y +#usr/share/doc/bison-3.0.4/examples/rpcalc +#usr/share/doc/bison-3.0.4/examples/rpcalc/rpcalc.y #usr/share/info/bison.info #usr/share/man/man1/bison.1 #usr/share/man/man1/yacc.1 diff --git a/lfs/bison b/lfs/bison index 6b84f41..322dd26 100644 --- a/lfs/bison +++ b/lfs/bison @@ -24,10 +24,10 @@

include Config

-VER = 2.5.1 +VER = 3.0.4

THISAPP = bison-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects =$(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8fedf916f1aa2c4a31441d8f8bbc603c +$(DL_FILE)_MD5 = c342201de104cc9ce0a21e0ad10d4021

install : $(TARGET)

@@ -69,10 +69,8 @@ $(subst %,%_MD5,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - # Disable NLS - #cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --docdir=/usr/share/doc/$(THISAPP) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(EXTRA_INSTALL) install @rm -rf $(DIR_APP)