From patchwork Mon May 6 22:34:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 13925 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C00B716FB4; Mon, 6 May 2019 23:35:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4607416FAF for ; Mon, 6 May 2019 23:35:07 +0100 (BST) Received: from localhost ([127.0.0.1]:34795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNmCP-00055T-Mx for patchwork@mira.cbaines.net; Mon, 06 May 2019 18:35:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNmCN-00054y-Jt for guix-patches@gnu.org; Mon, 06 May 2019 18:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNmCM-0003en-MT for guix-patches@gnu.org; Mon, 06 May 2019 18:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44173) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNmCM-0003eK-8t for guix-patches@gnu.org; Mon, 06 May 2019 18:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hNmCM-0000B3-4A for guix-patches@gnu.org; Mon, 06 May 2019 18:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35611] [PATCH 2/2] gnu: Allow building gcc with non-default libc. References: In-Reply-To: Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 May 2019 22:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35611 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "35611@debbugs.gnu.org" <35611@debbugs.gnu.org> Received: via spool by 35611-submit@debbugs.gnu.org id=B35611.1557182072605 (code B ref 35611); Mon, 06 May 2019 22:35:02 +0000 Received: (at 35611) by debbugs.gnu.org; 6 May 2019 22:34:32 +0000 Received: from localhost ([127.0.0.1]:57716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNmBr-00009h-Vd for submit@debbugs.gnu.org; Mon, 06 May 2019 18:34:32 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:15955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNmBp-00009P-Tr for 35611@debbugs.gnu.org; Mon, 06 May 2019 18:34:30 -0400 Date: Mon, 06 May 2019 22:34:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1557182063; bh=bJ8cyGQqz/mc7+snfo9CTW+jdPt4FtrmQp13NtO7C70=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=JayQIj7rnmgGVUux55u7LZV0EqtCHcO9MmmZmyjDh5dm09tgAy8ka1uYvyUIlGfqD 1wK9PQ370J8L66WoTUK7kxDMK4VvY9s1a+jJZbdeFx9E/1GKdYoLWs7+CUGpuXC4Gm J2ywJ0vgI1T/ui9hCEFbOYEOYVJWb1zURrk7IvCE= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (make-gcc-libc): New procedure, returns a gcc that targets a specified libc. (gcc-glibc-2.26, gcc-glibc-2.27): New public variables. --- gnu/packages/base.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 2.21.0 diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e33e3c52c8..5c0cd36c14 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1009,6 +1009,35 @@ with the Linux kernel.") (("/bin/pwd") "pwd")) #t)))))))) +(define (make-gcc-libc base-gcc libc) + "Return a GCC that targets LIBC." + (package (inherit base-gcc) + (name (string-append (package-name base-gcc) "-" + (package-name libc) "-" + (package-version libc))) + (arguments + (substitute-keyword-arguments + (ensure-keyword-arguments (package-arguments base-gcc) + '(#:implicit-inputs? #f)) + ((#:make-flags flags) + `(let ((libc (assoc-ref %build-inputs "libc"))) + ;; FLAGS_FOR_TARGET are needed for the target libraries to receive + ;; the -Bxxx for the startfiles. + (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib") + ,flags))))) + (native-inputs + `(("libc" ,libc) + ("libc:static" ,libc "static") + ,@(append (package-inputs base-gcc) + (fold alist-delete (%final-inputs) '("libc" "libc:static"))))) + (inputs '()))) + +(define-public gcc-glibc-2.27 + (make-gcc-libc gcc glibc-2.27)) + +(define-public gcc-glibc-2.26 + (make-gcc-libc gcc glibc-2.26)) + (define-public (make-glibc-locales glibc) (package (inherit glibc)