From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id DHaaGYIIzmD+EgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:08:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8KGfFIIIzmAdFgAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:08:50 +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 8E08A2C5A8 for ; Sat, 19 Jun 2021 17:08:49 +0200 (CEST) Received: from localhost ([::1]:56736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaW-00043G-KS for larch@yhetil.org; Sat, 19 Jun 2021 11:08:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY7-00082d-NT for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY6-000812-Nk for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY6-0005iE-Jb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 34/36] libelf: Use the cross-compiler when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:18 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411517321869 (code B ref 49025); Sat, 19 Jun 2021 15:06:18 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:13 +0000 Received: from localhost ([127.0.0.1]:60439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucY1-0005gV-0h for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:13 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:60294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Xr-Ez for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:31 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4G6fH205PpzMqsJd for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:18 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrV; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:56 +0200 Message-Id: <20210619150458.12057-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115118; bh=RWokKCzoehfrSlcLNti6dqTDx97owvOxCcB16lv8MSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AVUlWDEVfakDilOV9svovNxfI6Cz432e8fRsO+WNXO2uPFjXI6v0VfYjoWFCUTDe9 5QE6U7p/3hRLGSbs0+fDZOS0MLW9PTQwgP9jimUV470V75ktd1BWB40HHyg5VMt3bS xVpqyt940EmhegmPI2Th0cHrT2UVRfltjo5e9qE54N6K7aVFIbQp52lqIkjRgTUQ4A a8hhiOo/5rckf9ae3+bmgG9go9qmBILEAlEyO1pz3LhhF+pCp9Lm8ovu99vkZr2UQm fIBqbQsnv9Um1hp535lUi8Dnb6gtGEEGpuxO2advS+KTmuJQVGmkffASl4InoSBmMo TKT9WuO/AjDPQ== 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624115329; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=RWokKCzoehfrSlcLNti6dqTDx97owvOxCcB16lv8MSw=; b=LKY12XqftNVIZU+ZOLtaJaJnykBoJeQJvMr6xDaEYZJ9M7M607rM78H/f/zdAYF8MshDBy upKn5mvYDExW1owEC4SOJOnjJ0igyJmt3wI4I4A88+hPCNgzLuDKWl5WtYRdYMt2GppJUP 84osDgu1Xw3Q9zW6ZVJgQZZzk3pCeA73gGKSPOqVbyuWEOXbLZYRNgf2VIl13JBrDNn2Wx AGR93VT8ijyrs439eXp2G/9dsPMURxnHdns/uFuisBvD0yhluxaOuzjhtDqnDcOTDaO7ou Lr5/XDMezOyrg6dEbsEiqXAUD/02dXv0glSzbUGbPKXMz7aofyNsLEPAzsaK0g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115329; a=rsa-sha256; cv=none; b=h/1va1NzTxGaoYg7f3ZIKYtalyySsqZFCyOSwox0DV+N3S+H8Z52/Z92s11gjDM3+iDI59 q/xbNSvDTXniiq7uknqLbtkXBozlonZ63ry3agf2HmgfuiqpEePyCmK85oUFoZvHXPOTqR jS1p5H7XxPC2gNLVsedWNSiZfLLTc5OuKORudm6DbPz0RVSbP32EwIxf4zcNyxJ/hDmrCk Jw/j318ELOYWveKjOhFgl3UB5adcD8zN8CrKjhHLH8+QoMAQs2HfrEE559CtP1Pi5FLZFQ 4dvdFMnGDORF3nDJgqtMWGrFfIGSPj60TUG9NCc9Dl3YWjAttaEyS+s2BWOljA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=AVUlWDEV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=AVUlWDEV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8E08A2C5A8 X-Spam-Score: -0.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: /aoaoIyJBjbV * 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") -- 2.32.0