Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 09 Jul 2018 08:27:56
Message-Id: 1531124700.71be4aab42ffdfbe2177b1ba6639f9bf935251f7.heroxbd@gentoo
1 commit: 71be4aab42ffdfbe2177b1ba6639f9bf935251f7
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 9 08:25:00 2018 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 9 08:25:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=71be4aab
7
8 scripts/bootstrap-prefix.sh: improve the fake makeinfo.
9
10 In the glibc build,
11
12 makeinfo -P <dir> --output=libc.info libc.texinfo
13
14 is called and we should ignore -P.
15
16 Credit: huiyiqun
17
18 scripts/bootstrap-prefix.sh | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
22 index 07695383bf..ad21815f9e 100755
23 --- a/scripts/bootstrap-prefix.sh
24 +++ b/scripts/bootstrap-prefix.sh
25 @@ -1648,14 +1648,14 @@ bootstrap_stage3() {
26
27 # GCC sometimes decides that it needs to run makeinfo to update some
28 # info pages from .texi files. Obviously we don't care at this
29 - # stage and rather have it continue instead of abort the build
30 + # stage and rather have it continue instead of aborting the build
31 [[ -x "${ROOT}"/usr/bin/makeinfo ]] || cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
32 #!${ROOT}/bin/bash
33 echo "makeinfo GNU texinfo 4.13"
34 for a in \$@; do
35 case \$a in
36 --*) f=\$(echo "\$a" | sed -r 's,--.*=(.*),\1,') ;;
37 - -*) ;;
38 + -*) continue ;;
39 *) f=\$a ;;
40 esac
41 [[ -e \$f ]] || touch \$f