From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mJnIHorH7mDTAQAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 13:16:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eEp4GorH7mD0DQAA1q6Kng (envelope-from ) for ; Wed, 14 Jul 2021 11:16:26 +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 E0EB515A41 for ; Wed, 14 Jul 2021 13:16:25 +0200 (CEST) Received: from localhost ([::1]:51598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3csK-0005HA-VI for larch@yhetil.org; Wed, 14 Jul 2021 07:16:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3cqC-00019w-62 for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3cqA-00012r-Hn for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3cqA-0001Rb-Dp for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v6 21/22] libelf: Update configure script and config.guess and config.sub. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jul 2021 11:14:10 +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: Mathieu Othacehe , Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.16262612285364 (code B ref 49025); Wed, 14 Jul 2021 11:14:10 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jul 2021 11:13:48 +0000 Received: from localhost ([127.0.0.1]:43183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpn-0001OM-VD for submit@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:48 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpV-0001Jd-Cz for 49025@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:30 -0400 Received: from localhost.localdomain ([188.188.219.228]) by andre.telenet-ops.be with bizsmtp id UzDG2500W4wFxCU01zDUH9; Wed, 14 Jul 2021 13:13:29 +0200 From: Maxime Devos Date: Wed, 14 Jul 2021 13:13:06 +0200 Message-Id: <20210714111307.19324-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210714111307.19324-1-maximedevos@telenet.be> References: <20210714111307.19324-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=1626261209; bh=PmFSgOK+NW3vsdrropSeKY9k4clOeil1DsdklQk68os=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mSe25dcGEyF84xHyi51hSmnzd3uX479YIH19xeAN4MVIxGY8SywMEadYY2wk3PKKH coca6t0chgCZm7QMG62OKnQ3dpcc6FX9p0uCoCYsTsUUSmn0s05OVvpBjZ2Ac/Lg5t NPOVGmd/lKSxZunZ7MKkviAsLmfZy9KD84W25QDc5PUQd0EhITPZCVXXu8UABgZmEy tscVUYr7wUenAEie3SsekM/3zlMzgT3Q8nZtxblHfTEiicekNhD/dm1jCzwJCwIB49 Ix2cOzWBbhjYLluOKmoMfIouM6Dza4ZbabQFF4B+/YRWW6TpvsqsVgvx5qffNxG2QP HIlMuTQME32KA== 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=1626261386; 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=PmFSgOK+NW3vsdrropSeKY9k4clOeil1DsdklQk68os=; b=gyG+sijAlH4BxwGhGqK31GS5dWqljddSig0/WkwOv1UzetYNOznOVH/Hoc7GF0GM+lE0u/ V/zJELPlN92oLQ2iY1t7RZlz1nA0PrIOQvzVn8d+sAmlxUzUjdMGPoE05EcseaWuQcoDZ/ x7KBWdovSGS66zYVKBpk1n+c5stNBB7CXUcCcu+5X17/c738cbBKrHHNp9Z6XUOX9rrB6J tpVR+C21h0xVrjPoly2tLxoX+m7SB3LS5mIfDyBdD8rObtY12TzB7gJBEM255GRM88/B1/ rrtleowLSSU/wYqzN/iSwc5NxwKrWb6YL915CpglQOuhqesD9tcg/6Oa+TY9Lg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626261386; a=rsa-sha256; cv=none; b=MUL2rcweND8Aw5lV18o5VhWJs6vPCZkpLvN3pVnaQ0grUdXtxBUgrNMiB2J8lozEmZAf2D SazuJNmuOI6jPUAsEvnnfsgAHz1TaEqlz4rVlQGM4EvRJWHk+HGoSbCBajgp789zxhO5dD 8pAhVRRqjhrBB8/XjldH2ho2ek6f52lE4DPwW9E+6L1gLI4SsXLG1/Wvy9t7fh2Dawrag1 iWZcq+RFsfykb/+DiRkr3Fz29cW8hG057D7mrfexTnFgjIKK7komBb9iln0twuBb7lRhnF BwXXuNrm+jxeCRFuwEmxwKnb/pV8AODmAD5j1kFiIgmtMV5e4Bx2ob8lvVdv4g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=mSe25dcG; 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.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=mSe25dcG; 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: E0EB515A41 X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: q4q5R/93VJLb The current configure script is too old to find the cross-compiler and support variables passed as arguments. Also, config.guess and config.sub are too old to recognise powerpc64 and aarch64. Solve this by regenerating the 'configure' script and replacing 'config.guess' and 'config.sub'. * gnu/packages/elf.scm (libelf)[arguments]<#:phases>{configure}: Remove phase. (libelf)[arguments]<#:phases>{delete-configure}: Regenerate the configure script and replace 'config.guess' and 'config.sub'. --- gnu/packages/elf.scm | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 0309dd95b5..2bc1d00048 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,32 @@ 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") - '())))))))) + ;; This old 'configure' script doesn't support cross-compilation + ;; well. I.e., it fails to find the cross-compiler. Also, + ;; the old `configure' script doesn't support variables passed as + ;; arguments. A third problem is that config.sub is too old to + ;; recognise aarch64 and powerpc64le. + ;; + ;; Solve this by regenerating the configure script and letting + ;; autoreconf update 'config.sub'. While 'config.sub' is updated + ;; anyway, update 'config.guess' as well. + (add-before 'bootstrap 'delete-configure + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (delete-file "configure") + (delete-file "config.sub") + (delete-file "config.guess") + (for-each (lambda (file) + (install-file + (string-append + (assoc-ref (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ;; For up-to-date 'config.guess' and 'config.sub' + ("automake" ,automake))) (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