From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AGnjNSrb6mBVUQAAgWs5BA (envelope-from ) for ; Sun, 11 Jul 2021 13:51:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4BKpMSrb6mBDMAAAB5/wlQ (envelope-from ) for ; Sun, 11 Jul 2021 11:51:06 +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 3BCBC2A199 for ; Sun, 11 Jul 2021 13:51:06 +0200 (CEST) Received: from localhost ([::1]:55824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2XzF-0008Uv-94 for larch@yhetil.org; Sun, 11 Jul 2021 07:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2XxN-0004Ip-JJ for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2XxN-0008Mv-88 for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2XxN-00075b-84 for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v5 19/20] 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: Sun, 11 Jul 2021 11:49:09 +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: Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162600410327064 (code B ref 49025); Sun, 11 Jul 2021 11:49:09 +0000 Received: (at 49025) by debbugs.gnu.org; 11 Jul 2021 11:48:23 +0000 Received: from localhost ([127.0.0.1]:34078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2Xwc-00072M-Gh for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:23 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:38492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwN-0006y4-I1 for 49025@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:08 -0400 Received: from localhost.localdomain ([213.119.242.127]) by xavier.telenet-ops.be with bizsmtp id Tnno2500V2ldwth01no6sp; Sun, 11 Jul 2021 13:48:07 +0200 From: Maxime Devos Date: Sun, 11 Jul 2021 13:47:22 +0200 Message-Id: <20210711114723.27568-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711114723.27568-1-maximedevos@telenet.be> References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> <20210711114723.27568-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=1626004087; bh=PmFSgOK+NW3vsdrropSeKY9k4clOeil1DsdklQk68os=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JGjd3BbyspEvzgwufOwHaPl3n4HMvAUrqolL4tT0BJbWE0KwuWC9U6xgaQHB+9atp MLqqLj8K8clE9ScTf0XuRbxejto7IQ/I9s9OOxYtw7X+omaDHXHM8kEF+ccH9vxUd9 nuGOQi9IvkLNZeXeyW5yDuL3K+TYqLi4q6YPU3Dsq8w7u/KKyWQkXCiyaitRmoVFEi EFf5aAsCN2mCRzdC20noNeK5XR69tAK7ZIR1RGGkWZgDRAAUFCZ/Z3JaMaM+dKoGkQ 1fgKJckZbi51yKGwjAZQfzKCiqv5w7zyFkEfBsYuEmFkhtOt8SSKT1vhkrDlEOCeJm 9nKYuT1kAMVaw== 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=1626004266; 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=R2Uvu1iah9mprtbUNGfIao3eeofZWd9HskezBs8rOk+6D7bS5vDRI6Sr63SxGBfLOXjJ9k lE2WZEvm0OXvEI2hgny0LH/vPW9nZU05S0Rb6cs/UwT7cCgSMoQ/ars55q/toH1gT7hkQL GP3FZNODIHVFFkCulK/8ynszkMeMULTO+Dqj+/Cym433tmmZHQdZg9CB5/TWAFHRq5QttA 7ZH89Z9SsgrdEqJsdGV4xYA8oTk78jdpdgTr4rZQCFUttVb7Clt0Ky7gBBE0qpv+MowIbB iHv23XkMa7Xt01x//ckQ9CQNcADkKQAaV55VxLeVLiubTmVgZkZLqFA/Yn5koQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626004266; a=rsa-sha256; cv=none; b=JdPXss/W257Bl+QSGFbUfzl8tPlitqRqqZE8640h5j05Hi1baSMmt+YzbnCTs1HlN29Lcx dJjNig+3DPWn2rO1Cm3ngmlVA+/QX23KVZUfkLB8WlMc+gpLJn1I9HUVkK+DOYQoHmCFH7 9Z/6CUY6QydSsoknqSDSgp/pIiRoksj3w8P8Lw2l33+gYwDIc/ZHhYd7Ghn1nbMcFpnxkN 0Zb8/C4Hnpf0ITRuzvcofVYCa1sUEvV6IqelUokSAFmfNw+xtkkJC0MalfWnePZhPmCc/P aYZLNBw1MP4Dm133iwFay2NGUu8yZfQh0COEfx8iFwTMO9ZTokEe3bzPzdscAQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=JGjd3Bby; 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.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=JGjd3Bby; 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: 3BCBC2A199 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: rOC7GBfPV55D 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