[PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.

[PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* guix/build/make-bootstrap.scm (%libc-object-files-rx): Update regexp.
---
 guix/build/make-bootstrap.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index bc4c0e3d5..21c78cc8f 100644
--- a/guix/build/make-bootstrap.scm
+++ b/guix/build/make-bootstrap.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -64,7 +64,8 @@ when producing a bootstrap libc."
       #t))
 
   (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\
-util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|libc(rt|)_nonshared\\.a)$")
+util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\
+_nonshared\\.a)$")
 
   (setvbuf (current-output-port) _IOLBF)
   (let* ((libdir (string-append output "/lib")))
-- 
2.11.0

Re: [PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.

[David Craven]

>    (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\
> -util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|libc(rt|)_nonshared\\.a)$")
> +util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\
> +_nonshared\\.a)$")

Adding libpthread_nonshared.a increases the size of the bootstrap
binaries doesn't it? If you explain why it is needed we'll have to
accept it... ;)

Re: [PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.

[Manolis Ragkousis]

Sometimes I forget that people can't see what I think in my head :P

On 01/02/17 20:25, David Craven wrote:
>>    (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\
>> -util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|libc(rt|)_nonshared\\.a)$")
>> +util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\
>> +_nonshared\\.a)$")
> 
> Adding libpthread_nonshared.a increases the size of the bootstrap
> binaries doesn't it? If you explain why it is needed we'll have to
> accept it... ;)
> 

Directly from libpthread's Makefile:

# What we install as libpthread.so for programs to link against is in fact a
# link script.  It contains references for the various libraries we need.
# The libpthread.so object is not complete since some functions are only
# defined in libpthread_nonshared.a.

Manolis

Re: [PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.

[David Craven]

Hi Manolis,

I don't think anyone can argue with that. Thank you for fixing my
ignorance of the issue.

LGTM.

David