mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-14 15:25:23 +01:00
Replace bison 3.4.2 with bison 3.6.4
This commit is contained in:
Samuel Tyler
parent
63b24502c7
commit
00808ed08a
14 changed files with 349 additions and 119 deletions
|
|
@ -1,91 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2021 Samuel Tyler <samuel@samuelt.me>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
../gnulib-672663a/gnulib-tool --import --local-dir=gl \
|
||||
--lib=libbison \
|
||||
--source-base=lib \
|
||||
--m4-base=m4 \
|
||||
--po-base=gnulib-po \
|
||||
--doc-base=doc \
|
||||
--tests-base=tests \
|
||||
--aux-dir=build-aux \
|
||||
--makefile-name=gnulib.mk \
|
||||
--conditional-dependencies \
|
||||
--no-libtool \
|
||||
--macro-prefix=gl \
|
||||
--po-domain=bison \
|
||||
argmatch \
|
||||
array-list \
|
||||
assert \
|
||||
assure \
|
||||
bitsetv \
|
||||
c-strcase \
|
||||
calloc-posix \
|
||||
close \
|
||||
closeout \
|
||||
config-h \
|
||||
configmake \
|
||||
dirname \
|
||||
error \
|
||||
extensions \
|
||||
fdl \
|
||||
fopen-safer \
|
||||
fprintf-posix \
|
||||
getopt-gnu \
|
||||
gettext-h \
|
||||
git-version-gen \
|
||||
gitlog-to-changelog \
|
||||
gpl-3.0 \
|
||||
inttypes \
|
||||
isnan \
|
||||
javacomp-script \
|
||||
javaexec-script \
|
||||
ldexpl \
|
||||
libtextstyle-optional \
|
||||
mbswidth \
|
||||
non-recursive-gnulib-prefix-hack \
|
||||
obstack \
|
||||
obstack-printf \
|
||||
perror \
|
||||
printf-posix \
|
||||
progname \
|
||||
quote \
|
||||
quotearg \
|
||||
readme-release \
|
||||
realloc-posix \
|
||||
relocatable-prog \
|
||||
relocatable-script \
|
||||
rename \
|
||||
snprintf-posix \
|
||||
spawn-pipe \
|
||||
sprintf-posix \
|
||||
stdbool \
|
||||
stpcpy \
|
||||
strdup-posix \
|
||||
strerror \
|
||||
strverscmp \
|
||||
timevar \
|
||||
unistd \
|
||||
unistd-safer \
|
||||
unlink \
|
||||
unlocked-io \
|
||||
unsetenv \
|
||||
update-copyright \
|
||||
verify \
|
||||
vsnprintf-posix \
|
||||
vsprintf-posix \
|
||||
warnings \
|
||||
xalloc \
|
||||
xalloc-die \
|
||||
xconcat-filename \
|
||||
xhash \
|
||||
xlist \
|
||||
xmemdup0 \
|
||||
xstrndup
|
||||
|
||||
../gnulib-672663a/build-aux/prefix-gnulib-mk \
|
||||
--lib-name=libbison \
|
||||
lib/gnulib.mk
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2021-22 Samuel Tyler <samuel@samuelt.me>
|
||||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove pre-generated flex/bison files
|
||||
rm src/parse-gram.c src/parse-gram.h
|
||||
rm src/scan-code.c
|
||||
rm src/scan-gram.c
|
||||
rm src/scan-skel.c
|
||||
|
||||
# Remove pregenerated info files
|
||||
rm doc/bison.info
|
||||
|
||||
../../import-gnulib.sh
|
||||
|
||||
AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --prefix="${PREFIX}" \
|
||||
--libdir="${LIBDIR}" \
|
||||
--disable-nls
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
make -j1 MAKEINFO=true
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make MAKEINFO=true DESTDIR="${DESTDIR}" install
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 Samuel Tyler <samuel@samuelt.me>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
Again, same as bison 2.3. I cannot figure out what gnulib/bison are doing
|
||||
that makes this required...
|
||||
|
||||
--- bison-3.4.2/Makefile.am 2021-04-15 12:18:34.371818904 +1000
|
||||
+++ bison-3.4.2/Makefile.am 2021-04-15 12:18:39.055851647 +1000
|
||||
@@ -63,6 +63,7 @@
|
||||
check_SCRIPTS =
|
||||
dist_TESTS =
|
||||
noinst_LIBRARIES =
|
||||
+lib_libbison_a_SOURCES =
|
||||
|
||||
include build-aux/local.mk
|
||||
include data/local.mk
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 Samuel Tyler <samuel@samuelt.me>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
Why do they insist on using themselves to bootstrap themselves? It doesn't
|
||||
exist...
|
||||
|
||||
--- bison-3.4.2/Makefile.am 2021-04-15 21:29:36.596205032 +1000
|
||||
+++ bison-3.4.2/Makefile.am 2021-04-15 21:30:00.367365897 +1000
|
||||
@@ -39,7 +39,7 @@
|
||||
## Running the bison from this tarball. To generate our own parser,
|
||||
## but also to run the tests. Of course, you ought to keep a sane
|
||||
## version of Bison nearby...
|
||||
-BISON = $(top_builddir)/tests/bison
|
||||
+BISON = /usr/bin/bison
|
||||
BISON_IN = $(top_srcdir)/tests/bison.in
|
||||
YACC = $(BISON) -o y.tab.c
|
||||
AM_YFLAGS_WITH_LINES = --defines -Werror -Wall --report=all
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 Samuel Tyler <samuel@samuelt.me>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
We don't have network access at this stage to "Fetch PO files".
|
||||
|
||||
--- gnulib-672663a/gnulib-tool 2021-04-15 21:07:04.538055553 +1000
|
||||
+++ gnulib-672663a/gnulib-tool 2021-04-15 21:07:16.424135984 +1000
|
||||
@@ -5564,16 +5564,6 @@
|
||||
fi
|
||||
func_append added_files "$pobase/POTFILES.in$nl"
|
||||
fi
|
||||
- # Fetch PO files.
|
||||
- TP_URL="https://translationproject.org/latest/"
|
||||
- if $doit; then
|
||||
- echo "Fetching gnulib PO files from $TP_URL"
|
||||
- (cd "$destdir"/$pobase \
|
||||
- && wget --no-verbose --mirror --level=1 -nd -A.po -P . "${TP_URL}gnulib/"
|
||||
- )
|
||||
- else
|
||||
- echo "Fetch gnulib PO files from $TP_URL"
|
||||
- fi
|
||||
# Create po/LINGUAS.
|
||||
if $doit; then
|
||||
func_dest_tmpfilename $pobase/LINGUAS
|
||||
Loading…
Add table
Add a link
Reference in a new issue