From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 24069@debbugs.gnu.org
Subject: bug#24069: [PATCHv2] Re: bug#24069: gcc man page is broken
Date: Mon, 02 Oct 2017 16:15:10 -0400 [thread overview]
Message-ID: <87zi992to1.fsf@gmail.com> (raw)
In-Reply-To: <871smlppn5.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 02 Oct 2017 16:53:34 +0200")
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
Hello,
ludo@gnu.org (Ludovic Courtès) writes:
> Efraim Flashner <efraim@flashner.co.il> skribis:
>
>> I believe this would cause gcc-5 to be rebuilt, which would cause a
>> world rebuild, so for the moment we also need a native-inputs entry for
>> gcc-5 making sure that nothing changes, ie: that we're only using
>> texinfo there, preferably with a note that it should be changed in the
>> future. Also, you should take a look at gnu/packages/commencement and
>> make sure that we're not adding perl as a native-input for gcc-boot0 or
>> for libstdc++, wherever that happens to live (I don't remember off
>> hand).
>
> I think this should go to ‘core-updates’.
>
>> I assume it is OK for us to build the man pages for gcc-final (if it
>> happens) since this is the gcc used for actually building packages, and
>> I believe the one pulled in for gcc-toolchain.
>
> More precisely, building man pages for ‘gcc-boot0’ is pointless and
> possibly adds Perl on the graph for no good reason. So if we can
> arrange to just have man pages in ‘gcc-final’, we’re good.
>
> Efraim, could you check whether that works for ‘core-updates’?
>
> Thanks,
> Ludo’.
I believe this is what is accomplished by the attached patch v3. Thanks
to Efraim for the points raised. It turned out that the stack overflow I
was getting attempting to test the previous version was caused by a
circular dependency that was introduced by gcc-boot0 inheriting
perl. This is now fixed.
I spent the last couple hours rebuilding gcc but it failed due to lack
of space on my side... Retrying now but it'll take a few hours before I
can confirm that it works as intended.
Thank you both!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gcc-Fix-manual-pages.patch --]
[-- Type: text/x-patch, Size: 2971 bytes --]
From fac707c34dcc04fcac7254a724cd4c45ae384400 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 1 Oct 2017 09:27:31 -0400
Subject: [PATCH] gnu: gcc: Fix manual pages.
Fixes bug #24069.
* gnu/packages/gcc.scm (gcc-4.7)[native-inputs]: Add perl.
(gcc-4.9)[native-inputs]: Likewise.
* gnu/packages/commencement.scm (gcc-boot0)[native-inputs]: Filter out perl.
(gcc-final)[native-inputs]: Add perl-boot0.
---
gnu/packages/commencement.scm | 9 ++++++---
gnu/packages/gcc.scm | 7 +++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ec7677814..194feda0a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -286,9 +286,11 @@
("libc-native" ,@(assoc-ref %boot0-inputs "libc"))
,@(alist-delete "libc" %boot0-inputs)))
- ;; No need for Texinfo at this stage.
- (native-inputs (alist-delete "texinfo"
- (package-native-inputs gcc))))))
+ ;; No need for the documentation native-inputs at this stage.
+ (native-inputs
+ (alist-delete "texinfo"
+ (alist-delete "perl"
+ (package-native-inputs gcc)))))))
(define perl-boot0
(let ((perl (package
@@ -779,6 +781,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; scripts such as 'mkheaders' and 'fixinc.sh' (XXX: who cares about these
;; scripts?).
(native-inputs `(("texinfo" ,texinfo-boot0)
+ ("perl" ,perl-boot0) ;for manpages
("static-bash" ,static-bash-for-glibc)
,@(package-native-inputs gcc-boot0)))
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 7870d4513..7089b420f 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -155,7 +155,8 @@ where the OS part is overloaded to denote a specific ABI---into GCC
;; GCC < 5 is one of the few packages that doesn't ship .info files.
;; Newer texinfos fail to build the manual, so we use an older one.
- (native-inputs `(("texinfo" ,texinfo-5)))
+ (native-inputs `(("perl" ,perl) ;for manpages
+ ("texinfo" ,texinfo-5)))
(arguments
`(#:out-of-source? #t
@@ -370,7 +371,9 @@ Go. It also includes runtime support libraries for these languages.")
"14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"))
(patches (search-patches "gcc-arm-bug-71399.patch"
"gcc-libvtv-runpath.patch"))))
- (native-inputs `(("texinfo" ,texinfo)))))
+ ;; Override inherited texinfo-5 with latest version.
+ (native-inputs `(("perl" ,perl) ;for manpages
+ ("texinfo" ,texinfo)))))
(define-public gcc-5
;; Note: GCC >= 5 ships with .info files but 'make install' fails to install
--
2.14.1
next prev parent reply other threads:[~2017-10-02 20:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-25 20:23 bug#24069: gcc man page is broken Danny Milosavljevic
2017-03-30 22:22 ` Branson, Joshua A
2017-09-30 20:36 ` Maxim Cournoyer
2017-10-01 13:39 ` bug#24069: [PATCH] " Maxim Cournoyer
2017-10-01 15:54 ` bug#24069: [PATCHv2] " Maxim Cournoyer
2017-10-02 9:24 ` Efraim Flashner
2017-10-02 14:53 ` Ludovic Courtès
2017-10-02 20:15 ` Maxim Cournoyer [this message]
2017-10-03 2:28 ` bug#24069: [PATCHv3] " Maxim Cournoyer
2017-10-03 23:44 ` bug#24069: [PATCHv4] " Maxim Cournoyer
2017-10-31 15:16 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zi992to1.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=24069@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).