From patchwork Fri Oct 25 15:40:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 15828 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 947251761C; Fri, 25 Oct 2019 16:41:13 +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,RCVD_IN_MSPIKE_H2, 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 58D1A1759C for ; Fri, 25 Oct 2019 16:41:13 +0100 (BST) Received: from localhost ([::1]:33962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO1iC-0000hi-6B for patchwork@mira.cbaines.net; Fri, 25 Oct 2019 11:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59064) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO1i3-0000PT-FD for guix-patches@gnu.org; Fri, 25 Oct 2019 11:41:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO1i2-0000Ey-7S for guix-patches@gnu.org; Fri, 25 Oct 2019 11:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO1i2-0000Es-41 for guix-patches@gnu.org; Fri, 25 Oct 2019 11:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iO1i1-0002CC-Vx for guix-patches@gnu.org; Fri, 25 Oct 2019 11:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37924] [PATCH] gnu: Fix make-gcc-libc Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2019 15:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37924 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37924@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.15720180408402 (code B ref -1); Fri, 25 Oct 2019 15:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2019 15:40:40 +0000 Received: from localhost ([127.0.0.1]:39263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO1hg-0002BR-DR for submit@debbugs.gnu.org; Fri, 25 Oct 2019 11:40:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:48286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO1hc-0002BE-KC for submit@debbugs.gnu.org; Fri, 25 Oct 2019 11:40:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58997) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO1hY-000738-Rk for guix-patches@gnu.org; Fri, 25 Oct 2019 11:40:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO1hW-0008W7-6o for guix-patches@gnu.org; Fri, 25 Oct 2019 11:40:32 -0400 Received: from mail4.protonmail.ch ([185.70.40.27]:39107) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO1hV-0008Ur-LK for guix-patches@gnu.org; Fri, 25 Oct 2019 11:40:30 -0400 Date: Fri, 25 Oct 2019 15:40:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1572018026; bh=+c2c6iuh1FYlXbGnhRl34kIscJFYpCOnG6qnm+qtlkw=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=RB0FN9aNaHMpTmAneRFSEog/EVt01zG+wlpEm1q+tHa3CR1NpRa5FmYEOPTdKOX9s IcpYwhg0UuLRkUqfS/DEErefqlH29bm51ep/oDigWzaEiCdOnth7IiP0KaGmkJ59+B yKEykfKc/XST15s1mKD+apZAdOgJDA0Fi3uLtjaA= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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 Reviewers, would like some insight into whether it's okay to remove the FLAGS_FOR_TARGET. From what I can tell it comes from CROSS-GCC-ARGUMENTS in (gnu packages cross-base) which might not be needed here since we're not cross-building. I've tested this toolchain built without FLAGS_FOR_TARGET and it _seems_ to work fine. ----- Until now the following wouldn't build: --8<---------------cut here---------------start------------->8--- (use-modules (gnu packages commencement) (gnu packages gcc) (gnu packages base)) (make-gcc-libc gcc-9 glibc-2.27) --8<---------------cut here---------------end--------------->8--- * gnu/packages/base.scm (make-gcc-libc)[phases]: Add environment variables to place the target libc on the system header search path. [make-flags]: Remove unncessary FLAGS_FOR_TARGET. [native-inputs]: Construct in a way that doesn't require emptying inputs. --- gnu/packages/base.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) -- 2.23.0 diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4e80a2fadb..3a3360dc7a 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -981,18 +981,23 @@ with the Linux kernel.") (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))))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda _ + (let ((libc (assoc-ref %build-inputs "libc"))) + ;; GCCs build processes requires that the libc + ;; we're building against is on the system header + ;; search path. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + #t))))))) (native-inputs - `(("libc" ,libc) - ("libc:static" ,libc "static") - ,@(append (package-inputs base-gcc) - (fold alist-delete (%final-inputs) '("libc" "libc:static"))))) - (inputs '()))) + `(,@(package-native-inputs base-gcc) + ,@(append (fold alist-delete (%final-inputs) '("libc" "libc:static"))) + ("libc" ,libc) + ("libc:static" ,libc "static"))))) (define-public (make-glibc-locales glibc) (package From patchwork Fri Oct 25 16:21:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 15830 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 EA81917654; Fri, 25 Oct 2019 17:39:05 +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,RCVD_IN_MSPIKE_H2, 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 B668D17642 for ; Fri, 25 Oct 2019 17:39:05 +0100 (BST) Received: from localhost ([::1]:34570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO2cD-00062R-2c for patchwork@mira.cbaines.net; Fri, 25 Oct 2019 12:39:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO2Lk-00060S-3f for guix-patches@gnu.org; Fri, 25 Oct 2019 12:22:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO2Li-00009t-RH for guix-patches@gnu.org; Fri, 25 Oct 2019 12:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58708) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO2Li-00009l-Hr for guix-patches@gnu.org; Fri, 25 Oct 2019 12:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iO2Li-0003H4-B0 for guix-patches@gnu.org; Fri, 25 Oct 2019 12:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37924] [PATCH 2/2] ci: Add 'make-gcc-toolchain' packages References: In-Reply-To: Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2019 16:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37924 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "37924@debbugs.gnu.org" <37924@debbugs.gnu.org> Received: via spool by 37924-submit@debbugs.gnu.org id=B37924.157202051912575 (code B ref 37924); Fri, 25 Oct 2019 16:22:02 +0000 Received: (at 37924) by debbugs.gnu.org; 25 Oct 2019 16:21:59 +0000 Received: from localhost ([127.0.0.1]:39296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO2La-0003Gh-6j for submit@debbugs.gnu.org; Fri, 25 Oct 2019 12:21:58 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:18145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO2LX-0003GH-Ma for 37924@debbugs.gnu.org; Fri, 25 Oct 2019 12:21:52 -0400 Date: Fri, 25 Oct 2019 16:21:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1572020504; bh=fCFc+HHAjKqbFdv5lOwNwNm1yn4yy/sAGcax0UDdfh4=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=J+3WxRrN9HGOuXpYNGMjd91Jb1W1c4HDyTUNvd7B5xluEtraX5tdXzwlYWo46rVqy E1HuNQFRT1UDIirKEb924N6MWGJeQlVs8+/4fSZfd6glv4sDeicz+XY8BTv3i+lsNX qVtmbnERXIg7Ge6c24BfvTTdRjpcqt3LCcWYJt3M= 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/ci.scm (%core-packages): Add 'glibc-2.28', a toolchain with default 'gcc', and a toolchain targeting 'glibc-2.28'. --- gnu/ci.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.23.0 diff --git a/gnu/ci.scm b/gnu/ci.scm index 5d5a826647..74df3c34ab 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -110,9 +110,11 @@ SYSTEM." ;; Note: Don't put the '-final' package variants because (1) that's ;; implicit, and (2) they cannot be cross-built (due to the explicit input ;; chain.) - (list gcc-4.8 gcc-4.9 gcc-5 glibc binutils + (list gcc-4.8 gcc-4.9 gcc-5 glibc glibc-2.28 binutils gmp mpfr mpc coreutils findutils diffutils patch sed grep gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz + (make-gcc-toolchain gcc) + (make-gcc-toolchain gcc glibc-2.28) %bootstrap-binaries-tarball %binutils-bootstrap-tarball (%glibc-bootstrap-tarball)