Commit 1a41e665 authored by Maxime Joubert's avatar Maxime Joubert

build: bison: build nolimips with bison

In order to avoid conflicts between the LRDE bison version needed to
build nolimips and the last bison version install on the host machine,
this commit gets bison from the LRDE tarball, build it and use it.

This commit fixes also some ugly tabulations and trailing whitespaces.

* .gitignore,
* bootstrap,
* build-aux/bin/bison++.in,
* build-aux/gitlog-to-changelog,
* configure.ac: here.
parent 3a936754
Pipeline #3006 failed with stage
in 3 minutes and 30 seconds
......@@ -14,3 +14,7 @@ Makefile
/configure
/gnulib
/m4
/build-aux/bin/bison
/build-aux/bin/yacc
/build-aux/lib
/build-aux/share
......@@ -259,6 +259,31 @@ do
done
export LIBTOOLIZE=$libtoolize
TIGER_WEBSITE="https://www.lrde.epita.fr/~tiger/download"
BISON="bison-3.0.4.19-fbaf"
BISON_TARBALL="$BISON.tar.xz"
BISON_PREFIX_DIR="$(pwd)/build-aux"
BISON_BIN="$BISON_PREFIX_DIR/bin/bison"
# Getting LRDE bison
if [ ! -f "$BISON_BIN" ]; then
echo "$0: wget $TIGER_WEBSITE/$BISON_TARBALL"
wget -q $TIGER_WEBSITE/$BISON_TARBALL -O $BISON
echo "$0: tar -xvf $BISON"
tar -xvf $BISON
echo "$0: rm $BISON_TARBALL"
rm $BISON_TARBALL
# Building bison
echo "$0: mkdir $BISON/build"
mkdir $BISON/build
echo "$0: cd $BISON/build && ../configure && make"
cd $BISON/build
../configure --prefix=$BISON_PREFIX_DIR
make install
cd ../..
rm -r $BISON
fi
# Reconfigure, getting other files.
......
......@@ -205,7 +205,7 @@ install ()
# Exit status.
status=0
: ${BISON='@BISON@'}
: ${BISON='@abs_srcdir@/@BISON@'}
me=$(basename $0)
fuse_switch='@abs_srcdir@/fuse-switch'
......
......@@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
if 0;
# Convert git log output to ChangeLog format.
my $VERSION = '2016-03-22 21:49'; # UTC
my $VERSION = '2018-03-07 03:47'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2008-2016 Free Software Foundation, Inc.
# Copyright (C) 2008-2018 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -22,7 +22,7 @@ my $VERSION = '2016-03-22 21:49'; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Written by Jim Meyering
......@@ -33,7 +33,7 @@ use POSIX qw(strftime);
(my $ME = $0) =~ s|.*/||;
# use File::Coda; # http://meyering.net/code/Coda/
# use File::Coda; # https://meyering.net/code/Coda/
END {
defined fileno STDOUT or return;
close STDOUT and return;
......@@ -491,7 +491,7 @@ sub git_dir_option($)
# Local Variables:
# mode: perl
# indent-tabs-mode: nil
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "my $VERSION = '"
# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
# time-stamp-time-zone: "UTC0"
......
......@@ -19,8 +19,8 @@ AM_SILENT_RULES([yes])
## Development tools -------------------
# Look for a lex-like program.
AC_PROG_LEX
# Look for bison.
AC_CHECK_PROGS([BISON], [bison])
# Look for the lrde version of bison.
AC_CHECK_PROGS([BISON], [bison], [path = build-aux/bin])
# Look for a C++ compiler.
AC_LANG([C++])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment