From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@gnu.org>
Subject: Re: 27/33: gnu: commencement: glibc-intermediate: Build fixes for the
 Hurd.
Date: Tue, 10 Mar 2020 10:10:05 +0100
Message-ID: <87mu8owp76.fsf@gnu.org>
References: <20200310075832.7126.86402@vcs0.savannah.gnu.org>
 <20200310075851.4497E2125F@vcs0.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:49897)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ludo@gnu.org>) id 1jBatr-0001ES-Hj
 for guix-devel@gnu.org; Tue, 10 Mar 2020 05:10:08 -0400
In-Reply-To: <20200310075851.4497E2125F@vcs0.savannah.gnu.org>
 (guix-commits@gnu.org's message of "Tue, 10 Mar 2020 03:58:51 -0400
 (EDT)")
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: guix-devel@gnu.org, Jan Nieuwenhuizen <janneke@gnu.org>

guix-commits@gnu.org skribis:

>                     ;; Tell 'libpthread' where to find 'libihash' on Hurd=
 systems.
> -                   ,@(if (hurd-triplet? (%current-system))
> -                         `((substitute* "libpthread/Makefile"
> -                             (("LDLIBS-pthread.so =3D.*")
> -                              (string-append "LDLIBS-pthread.so =3D "
> -                                             (assoc-ref %build-inputs "k=
ernel-headers")
> -                                             "/lib/libihash.a\n"))))
> +                   ,@(if (hurd-system?)
> +                         `(map
> +                           (lambda (f)
> +                            (substitute* f
> +                              (("LDLIBS-pthread.so =3D.*")
> +                               (string-append "LDLIBS-pthread.so =3D "
> +                                              (assoc-ref %build-inputs "=
kernel-headers")
> +                                              "/lib/libihash.a\n")))
> +                            '("sysdeps/mach/Makefile"
> +                              "sysdeps/mach/hurd/Makefile:")))

=E2=80=98substitute*=E2=80=99 accepts a list of files, so you can write it =
like this:

  (substitute* '("sysdeps/mach/hurd/Makefile" "sysdeps/mach/Makefile")
    =E2=80=A6)

Ludo=E2=80=99.