From patchwork Mon Jun 14 15:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30245 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 6A32327BC81; Mon, 14 Jun 2021 16:48:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF83D27BC78 for ; Mon, 14 Jun 2021 16:48:11 +0100 (BST) Received: from localhost ([::1]:58270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoos-0000gj-Nn for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0006oN-0E for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh1-0008Lg-Ox for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh1-0004Md-B7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 34/37] libelf: Use the cross-compiler when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368516816682 (code B ref 49025); Mon, 14 Jun 2021 15:40:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:28 +0000 Received: from localhost ([127.0.0.1]:47638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogM-0004Kt-SS for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:27 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogK-0004Ah-Cr for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:21 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3fK2500S0mfAB4063fLSU; Mon, 14 Jun 2021 17:39:20 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:19 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685160; bh=DabbH4RUth/E4FzEFM3DBGQcqxP4ogR++HjfYem7CfE=; h=Subject:From:To:Date:In-Reply-To:References; b=EhBHCdXsD6GXMszf53HfyxeF59cUe9B87NTduV2Y6p/PAqt2kXZYBvnM/6sQljHR8 jKGlFQkBS/qr1EhG+P4Rj3KLYURYsDeevNv99KTCduePAKPS+w8EKyBLKuPHSDtUZn CVX2hmxPAFQnfC40eOXSPrnSjfYV1n+BCzanjyiuLNBhUdSTmJ/MBMngge+SLTADOU peRGWbG8z3xz1rvk658eWi+phVmM3OLccoMN5tYe/0vh+opYtEL0rLwMXwZHPp1yMq 3CNJajijbIl+o/pbmTBdmI/HmgDVoM7lTz0kEvw3gaRwx20irLibR7Ke5cUpNBPy3P 3gOZPIUdZStgA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/elf.scm (libelf)[arguments]<#:phases>{delete-configure}: Regenerate the configure script when cross-compiling. (libelf)[arguments]<#:phases>{configure}: Do not replace when cross-compiling. (libelf)[native-inputs]: Add autoconf when cross-compiling. --- gnu/packages/elf.scm | 48 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 0309dd95b5..66c2334e5c 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Mark Wielaard ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+)) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) @@ -205,22 +207,36 @@ static analysis of the ELF binaries at hand.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (invoke "./configure" - (string-append "--prefix=" out) - ,@(if (string=? "powerpc64le-linux" - (%current-system)) - '("--host=powerpc64le-unknown-linux-gnu") - '()) - ,@(if (string=? "aarch64-linux" - (%current-system)) - '("--host=aarch64-unknown-linux-gnu") - '())))))))) + ,(if (%current-target-system) + ;; This old 'configure' script doesn't + ;; support cross-compilation well. E.g., it fails + ;; to find the cross-compiler. + `(add-before 'bootstrap 'delete-configure + (lambda _ + (delete-file "configure"))) + `(replace 'configure + ;; This old `configure' script doesn't support + ;; variables passed as arguments. TODO: would + ;; simply regenerating 'configure' work + ;; well enough, even if compiling natively + ;; on powerpc or aarch64? + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" out) + ,@(if (string=? "powerpc64le-linux" + (%current-system)) + '("--host=powerpc64le-unknown-linux-gnu") + '()) + ,@(if (string=? "aarch64-linux" + (%current-system)) + '("--host=aarch64-unknown-linux-gnu") + '()))))))))) + (native-inputs + (if (%current-target-system) + `(("autoconf" ,autoconf)) + '())) (home-page (string-append "https://web.archive.org/web/20181111033959/" "http://www.mr511.de/software/english.html")) (synopsis "ELF object file access library")