len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-10-10 08:03:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

toolchain: Fix hosted arm/mips toolchain build with texinfo 7.0/7.1

Browse source 
A crash bug in those versions of texinfo (fixed in 7.20) caused the
glibc manual to fail to build.  There is no build-time argument to
disable the manual, but there is a version check that gracefully
accomplishes the same thing.

So, add 7.0/7.1 in the glibc configure script blacklist.

Change-Id: If841aceeb7986db8274d145a5ea317278890eb30
This commit is contained in:
Solomon Peachy 2026-09-28 12:55:21 -04:00
parent c47b2e1be2
commit e9a6b58870
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/rockboxdev.sh
View file

@ -852,7 +852,7 @@ do
#
glibcopts="--enable-kernel=2.6.23 --enable-oldest-abi=2.4"
build_linux_toolchain "arm-rockbox-linux-gnueabi" "2.38" "" "" "9.5.0" \
"$gccopts" "2.6.32.71" "" "2.20" "$glibcopts" "glibc-220-make44.patch glibc-2.20-gcc10.patch"
"$gccopts" "2.6.32.71" "" "2.20" "$glibcopts" "glibc-220-make44.patch glibc-2.20-gcc10.patch glibc-220-texinfo.patch"
# build alsa-lib
# we need to set the prefix to how it is on device (/usr) and then
# tweak install dir at make install step
@ -882,7 +882,7 @@ do
glibcopts="--enable-kernel=3.2 --enable-oldest-abi=2.16 --disable-werror"
# FIXME: maybe add -mhard-float?
build_linux_toolchain "mipsel-rockbox-linux-gnu" "2.38" "" "binutils-c23.patch" "9.5.0" \
"$gccopts" "3.10.108" "linux-c23.patch" "2.27" "$glibcopts" "glibc-227-make44.patch"
"$gccopts" "3.10.108" "linux-c23.patch" "2.27" "$glibcopts" "glibc-227-make44.patch glibc-227-texinfo.patch"
# build alsa-lib
# we need to set the prefix to how it is on device (/usr) and then
# tweak install dir at make install step

12
tools/toolchain-patches/glibc-220-texinfo.patch Normal file
View file

@ -0,0 +1,12 @@
diff -aur glibc-2.20/configure glibc-2.20-patch/configure
--- glibc-2.20/configure 2014-09-07 04:09:09.000000000 -0400
+++ glibc-2.20-patch/configure 2026-09-28 12:33:47.509475820 -0400
@@ -4851,7 +4851,7 @@
ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 4.[5-9]*|4.[1-9][0-9]*|[5-9].*)
+ 4.[5-9]*|4.[1-9][0-9]*|[5-6].*|7.[2-9]*|[8-9].*)
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

12
tools/toolchain-patches/glibc-227-texinfo.patch Normal file
View file

@ -0,0 +1,12 @@
diff -aur glibc-2.27/configure glibc-2.27-patch/configure
--- glibc-2.27/configure 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.27-patch/configure 2026-09-28 12:36:55.593733872 -0400
@@ -4814,7 +4814,7 @@
ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 4.[7-9]*|4.[1-9][0-9]*|[5-9].*)
+ 4.[5-9]*|4.[1-9][0-9]*|[5-6].*|7.[2-9]*|[8-9].*)
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;