From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH] gnu: Add glibc-hurd-headers
Date: Tue, 15 Apr 2014 00:20:01 +0200
Message-ID: <87vbubzh7y.fsf@gnu.org>
References: <CAFtzXzOZG6iYNacWOcmsp06qeAN_NQNboCczuTsy6oUBu5c2ag@mail.gmail.com>
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.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46596)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1WZpEb-0004yl-4s
	for Guix-devel@gnu.org; Mon, 14 Apr 2014 18:20:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1WZpES-000184-3x
	for Guix-devel@gnu.org; Mon, 14 Apr 2014 18:20:13 -0400
Received: from hera.aquilenet.fr ([2a01:474::1]:56909)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1WZpER-00016J-QC
	for Guix-devel@gnu.org; Mon, 14 Apr 2014 18:20:04 -0400
In-Reply-To: <CAFtzXzOZG6iYNacWOcmsp06qeAN_NQNboCczuTsy6oUBu5c2ag@mail.gmail.com>
	(Manolis Ragkousis's message of "Mon, 14 Apr 2014 22:00:09 +0000")
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: <http://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.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Manolis Ragkousis <manolis837@gmail.com>
Cc: Guix-devel@gnu.org

Manolis Ragkousis <manolis837@gmail.com> skribis:

> Take notice that it needs the patch "glibc-make-4.0.patch" for the
> configure check to pass. I should bring up this issue to the hurd
> guys.

That=E2=80=99s a sign that the Hurd=E2=80=99s libc should be rebased on top=
 of libc 2.19.

> +(define-public glibc/hurd-headers
> +  (package (inherit glibc)
> +           (name "glibc-hurd-headers")

The indentation is wrong (see this file for examples.)

> +           (arguments
> +            (substitute-keyword-arguments
> +                `(#:strip-binaries? #f
> +                  #:out-of-source? #t
> +                  #:tests? #f=20
> +                  #:configure-flags (list=20
> +                                     "--host=3Di686-pc-gnu"
> +                                     "--enable-addons"
> +                                     ;;"--disable-sanity-checks"
> +                                     (string-append "libc_cv_localedir=
=3D"
> +                                                    (assoc-ref %outputs =
"locales")
> +                                                    "/share/locale")
> +                                     (string-append "--with-headers=3D"
> +                                                    (assoc-ref %build-in=
puts "gnumach-headers")
> +                                                    "/include:"
> +                                                    (assoc-ref %build-in=
puts "hurd-headers")
> +                                                    "/include")
> +=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20
> +                                     ;; Use our Bash instead of /bin/sh.
> +                                     (string-append "BASH_SHELL=3D"
> +                                                    (assoc-ref %build-in=
puts "bash")
> +                                                    "/bin/bash"))
> +                  ,@(package-arguments glibc))
> +              ((#:phases phases)
> +               `(alist-replace
> +                 'install
> +                 (lambda _
> +                   (zero? (system* "make" "install-headers")))
> +                 (alist-delete
> +                 'build
> +                 ,phases)))))))

This looks good to me, but unnecessarily complex: get rid of
=E2=80=98substitute-keyword-arguments=E2=80=99:

  (arguments
    '(#:out-of-source? #t
      #:tests? #f
      #:configure-flags ...
      #:phases (alist-replace ... %standard-phases)))

HTH,
Ludo=E2=80=99.