From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ICxvJvA+e2BSDwAAgWs5BA (envelope-from ) for ; Sat, 17 Apr 2021 22:02:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qKZtIPA+e2BsSgAA1q6Kng (envelope-from ) for ; Sat, 17 Apr 2021 20:02:56 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EB16A1931F for ; Sat, 17 Apr 2021 22:02:55 +0200 (CEST) Received: from localhost ([::1]:34144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXr9a-00044q-On for larch@yhetil.org; Sat, 17 Apr 2021 16:02:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXr9Q-00044X-4j for guix-devel@gnu.org; Sat, 17 Apr 2021 16:02:44 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:40686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXr9M-0003EZ-Kr for guix-devel@gnu.org; Sat, 17 Apr 2021 16:02:43 -0400 Received: by mail-pg1-x531.google.com with SMTP id b17so21496801pgh.7 for ; Sat, 17 Apr 2021 13:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=1tPEQV62q9mE+xeVw462OVwOR+zOpL5lKP8zuZaYzSI=; b=ENr/0osXwZV7g05V2QPUQlWXvqOMbeAZkZmbNRZO3mGk/5fCgs/DmCtNSwYHH4KRYy C8GbFkmLte4nD0jXzqvR6UPwnEIdKwgUbGPNb2eL2N8/t3BjDPIdwDx33BNqwMJ52Bhp 10H0P6u6a4SAYLzK87Jccf/na8SvEKP7fYjAZ+WQOKWPCNUELCtSuUQ5uVfhjFhXGzG6 l8hHc89QkSF55GHmqlJB/OkPjMMhyLheywTdgpreM/1d3HrMbfDHe7GTHUYaxmQ9AMBT EkbZEWUSLIek1ocw/T1fv1wZTlD78gdX6vuKm+CI2+gVfeWR0lW+BAacAOjc2rRJmAXO aeIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=1tPEQV62q9mE+xeVw462OVwOR+zOpL5lKP8zuZaYzSI=; b=dsDvpcBLs3svJhV8njV1BvYOeqeIuJc/ELVG93JSOVqtHGa9hKweL5c5FtG6PfKpMN V7vqUBw0tskeOASkwh64TXA/kjymR7+hvtToRQst3YW4rW+8W3BW7bHR63fBM4iKa3js +s8vWCwzRpA2uzxwlozBpwFJs/buLCzLhonbj/s40+0tYjZt+ZR28jMq/mbqqJnM7Dt1 UBSGS0vMLtTDOKZmhs1e7e46+IlmcllTNezlSD6ZjK6Z5smbaYzZa3rjSXPIrvckcDsr IIB1tmMxYbhvXsp0kQSZ43x3ak9Txa4RX+nclyYLsOzFveJErsOFw9ylt6RfykFDXRs1 O2AA== X-Gm-Message-State: AOAM531EMNvZojtk65OwaUyj7uiM4259tL2DQs6KkevMIWdsnk+OP18m hIL6qd8SZca+XCfiV5lyeJI= X-Google-Smtp-Source: ABdhPJy8FjmzbqwHq11MazOyEsjp2uhbYdADMiJasHaZyBLS7PkRnUbtGzGDWgJRWlwPzUC/dRhp1A== X-Received: by 2002:a63:4d5c:: with SMTP id n28mr4707255pgl.436.1618689759012; Sat, 17 Apr 2021 13:02:39 -0700 (PDT) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id mv13sm9419646pjb.29.2021.04.17.13.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 13:02:37 -0700 (PDT) From: Chris Marusich To: Efraim Flashner Subject: Re: bug#47615: [PATCH 3/9] gnu: binutils: Adjust test suite on powerpc-linux. References: <8735vo1yhm.fsf_-_@gmail.com> Date: Sat, 17 Apr 2021 13:02:34 -0700 In-Reply-To: <8735vo1yhm.fsf_-_@gmail.com> (Chris Marusich's message of "Sat, 17 Apr 2021 12:51:01 -0700") Message-ID: <87y2dgznl1.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=cmmarusich@gmail.com; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org, 47615@debbugs.gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618689776; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1tPEQV62q9mE+xeVw462OVwOR+zOpL5lKP8zuZaYzSI=; b=pxjb0+LnoIWYeArqDrckBsZg0Gfb+fx3gXqR/fP0hfV05kH5QtFqbJpPWvITrEOyzkjksa 4Pptx0A7MAquNt3+wulOZfUTiBL17ivkHQOWm/Ii1g5PrOOoYKxerH3P+qPtvRkZ0OvYEc A8CGiem5MlT5OciPDTfsN8gwAsvUW6mO5ATyFDzeRUstjnYZaTes4kS+p7ZTVm8TQmwSxA +X8xJjZSeRbz553pIBm8QeCIIwERtm4Tca4vy095tqVqz8lX7sdrmIjvKSSO5LkUzg+LHq 86m6Uc8GsOvMZve05f/7O8QJjxpE4jOgY+qmD1LCLR9/EudDf7GHBLXVNipSvg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618689776; a=rsa-sha256; cv=none; b=gZOJAu+IYASpOy45VjkU4UlM8/yZsidW/DvkH6h3HBnHCCeNBFCJtzuVEVFocu747Qx8Lz lFOeRhg3F4NzuVzr+NUriI9HE2S/0LinQb9PwI6H1k00y5E9TUgZNmMlJudvyFisK7NJ95 OodD7Poxwhp/iZoubo8LNn0Ahlspx6xAa/TVEXOUSMJZUaRPfftiDlPJsrUTny2ENjUiuG M3QJJMeb9Nwa3fVevfPkEijhbsqFMLO6flRjxiYg+gb8wSnizdTLN4DQnXFOUlkoWTfyQ9 2FSbwParmUKNBC9mH+IXaV4EM3gfW/lMqU23pXKaK/hpywlDL3ZrF/cG78uEmw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="ENr/0osX"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Spam-Score: -2.74 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="ENr/0osX"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: EB16A1931F X-Spam-Score: -2.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: qymPVaZA3ifn --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Chris Marusich writes: > (define binutils-boot0 > (package > (inherit binutils) > (source (bootstrap-origin (package-source binutils))) > (name "binutils-cross-boot0") > (arguments > `(#:guile ,%bootstrap-guile > #:implicit-inputs? #f > > #:modules ((guix build gnu-build-system) > (guix build utils) > (ice-9 ftw)) ; for 'scandir' > > ,@(substitute-keyword-arguments (package-arguments binutils) > ((#:configure-flags cf) > `(cons ,(string-append "--target=3D" (boot-triplet)) > ,cf)) > ;; The presence of '%standard-phases as the default value here= is > ;; important. It ensures that even when (package-argument > ;; binutils) does not already contain the #:phases keyword > ;; argument, the substitution will occur. If you omit a defau= lt > ;; value and (package-arguments binutils) does not contain the > ;; #:phases keyword argument (e.g., on an x86_64-linux system), > ;; then the substitution will not occur, and no phases at all = will > ;; be added. > ((#:phases phases '%standard-phases) > `(modify-phases ,phases > ,@(if (string=3D? (%current-system) "powerpc-linux") > '((add-after 'unpack 'disable-rust-libiberty-test > (lambda _ > (substitute* "libiberty/testsuite/Makefile.in" > ((" check-rust-demangle ") "")) > #t))) > '()) > (add-after 'install 'add-symlinks > (lambda* (#:key outputs #:allow-other-keys) > ;; The cross-gcc invokes 'as', 'ld', etc, without the > ;; triplet prefix, so add symlinks. > (let ((out (assoc-ref outputs "out")) > (triplet-prefix (string-append ,(boot-triplet) "= -"))) > (define (has-triplet-prefix? name) > (string-prefix? triplet-prefix name)) > (define (remove-triplet-prefix name) > (substring name (string-length triplet-prefix))) > (with-directory-excursion (string-append out "/bin") > (for-each > (lambda (name) > (symlink name (remove-triplet-prefix name))) > (scandir "." has-triplet-prefix?))))))))))) > > (inputs (%boot0-inputs)))) Sorry, I meant to write this instead: (define binutils-boot0 (package (inherit binutils) (source (bootstrap-origin (package-source binutils))) (name "binutils-cross-boot0") (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f #:modules ((guix build gnu-build-system) (guix build utils) (ice-9 ftw)) ; for 'scandir' ,@(substitute-keyword-arguments (package-arguments binutils) ((#:configure-flags cf) `(cons ,(string-append "--target=3D" (boot-triplet)) ,cf)) ;; The presence of '%standard-phases as the default value here is ;; important. It ensures that even when (package-argument ;; binutils) does not already contain the #:phases keyword ;; argument, the substitution will occur. If you omit a default ;; value and (package-arguments binutils) does not contain the ;; #:phases keyword argument (e.g., on an x86_64-linux system), ;; then the substitution will not occur, and no phases at all wi= ll ;; be added. ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'install 'add-symlinks (lambda* (#:key outputs #:allow-other-keys) ;; The cross-gcc invokes 'as', 'ld', etc, without the ;; triplet prefix, so add symlinks. (let ((out (assoc-ref outputs "out")) (triplet-prefix (string-append ,(boot-triplet) "-"= ))) (define (has-triplet-prefix? name) (string-prefix? triplet-prefix name)) (define (remove-triplet-prefix name) (substring name (string-length triplet-prefix))) (with-directory-excursion (string-append out "/bin") (for-each (lambda (name) (symlink name (remove-triplet-prefix name))) (scandir "." has-triplet-prefix?))))))))))) (inputs (%boot0-inputs)))) The point is that we can probably "inherit" the phases, so we wouldn't have to repeat ourselves. =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmB7PtoVHGNtbWFydXNp Y2hAZ21haWwuY29tAAoJEN1AmhXYIkaddeEP/0AoZhuymDesDWRQy3vnqqFwqSBh /XkNnAflReWBptGC3a1BZ+xpTLDlWxSbrXu5ae2FHMHpjAc2V+8q95ITTobAQopf ihJ0nUIOs2lBhsOS9NDpUNOj1QDO87QlXcC0xpQelx9Grm8eYyiWmEClXOFzjqjW HRYoQgBsacBiM7QVgpsE2DPxJx5kKgsRECtRhj6wqslr+Hyth2uLqvsUQ8dlphkp TWKlQmHrz+bizCW2zuS9NazfZLmDS5r9F9v7xsBAYrf5W4YHvVpvcAFJBpPdhKFN /5eS+Cp4mGHitLOKafDbQ28P0Gdvh4Rg29vsNQw6yOG+yZTuZ5V++eZhTNuz9tgC AKSQ5RwNE6u972vVqDfVVdkoDkBIq5vqAuh9SWREIuP5YoejQJ0IGkzY/z30PATQ TPvTXaJ379nL0hoEgZ/TIaKm/YTgqmUcwIzPVhcNZDP6kz6/pgp1q7ZCA/ei9WUT 5CC/URA0l95FGgZayJSHO9+8pJBUVU/799zlBrk+QCCaXclPoxqMFqOZSheJArmD MUFq16UFVBwdtaUD6zfLSg/Uv9tLccmWpOyuSkQNyOmlVK4K637O/JDZbH2+f9OM IprnV/MNJDqtR3JXfyqQVCdsodPNdyemN01sgwqHjzKOULcJKobVFqK6fhKq/w2A TXeqpngDN0ipk/4+ =h4kS -----END PGP SIGNATURE----- --=-=-=--