mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
801c88295e
Add the patches with real changes from the binutils 2.40 stable branch. I am not aware that we ran into any of these problems, but I think it is better to take the existing stable patches. They were exported like this: git format-patch binutils-2_40...origin/binutils-2_40-branch I removed the patches changing the version numbers and updating the translations only. I removed the following patches: *Automatic-date-updat* 001-Re-enable-development.-Update-version-to-2.40.0.patch 004-Updated-translations-for-the-gas-and-binutils-sub-di.patch 015-Updated-Swedish-translation-for-the-binutils-sub-dir.patch 027-Updated-Swedish-translation-for-the-binutils-sub-dir.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From f7c5db99b76e8dde89335d794c82fcbfbf53c612 Mon Sep 17 00:00:00 2001
|
|
From: Enze Li <enze.li@hotmail.com>
|
|
Date: Sat, 14 Jan 2023 11:33:48 +0800
|
|
Subject: [PATCH 05/50] libctf: update regexp to allow makeinfo to build
|
|
document
|
|
|
|
While trying to build gdb on latest openSUSE Tumbleweed, I noticed the
|
|
following warning,
|
|
|
|
checking for makeinfo... makeinfo --split-size=5000000
|
|
configure: WARNING:
|
|
*** Makeinfo is too old. Info documentation will not be built.
|
|
|
|
then I checked the version of makeinfo, it said,
|
|
======
|
|
$ makeinfo --version
|
|
texi2any (GNU texinfo) 7.0.1
|
|
|
|
Copyright (C) 2022 Free Software Foundation, Inc.
|
|
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
|
|
This is free software: you are free to change and redistribute it.
|
|
There is NO WARRANTY, to the extent permitted by law.
|
|
======
|
|
|
|
After digging a little bit, it became quite obvious that a dot is
|
|
missing in regexp that makes it impossible to match versions higher than
|
|
7.0, and here's the solution:
|
|
|
|
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
|
|
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]\.[0-9])' >/dev/null 2>&1; then
|
|
|
|
However, Eli pointed out that the solution above has another problem: it
|
|
will stop working when Texinfo 10.1 will be released. Meanwhile, he
|
|
suggested to solve this problem permanently. That is, we don't care
|
|
about the minor version for Texinfo > 6.9, we only care about the major
|
|
version.
|
|
|
|
In this way, the problem will be resolved permanently, thanks to Eli.
|
|
|
|
libctf/ChangeLog:
|
|
|
|
* configure: Regenerated.
|
|
* configure.ac: Update regexp to match versions higher than 7.0.
|
|
---
|
|
libctf/configure | 2 +-
|
|
libctf/configure.ac | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/libctf/configure
|
|
+++ b/libctf/configure
|
|
@@ -14865,7 +14865,7 @@ esac
|
|
# We require texinfo to be 6.3 or later, for a working synindex
|
|
# and validatemenus: otherwise we fall back to /bin/true.
|
|
if ${MAKEINFO} --version \
|
|
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
|
|
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]|[1-6][0-9])' >/dev/null 2>&1; then
|
|
build_info=yes
|
|
else
|
|
build_info=
|
|
--- a/libctf/configure.ac
|
|
+++ b/libctf/configure.ac
|
|
@@ -184,7 +184,7 @@ changequote(,)
|
|
# We require texinfo to be 6.3 or later, for a working synindex
|
|
# and validatemenus: otherwise we fall back to /bin/true.
|
|
if ${MAKEINFO} --version \
|
|
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
|
|
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]|[1-6][0-9])' >/dev/null 2>&1; then
|
|
build_info=yes
|
|
else
|
|
build_info=
|