From patchwork Thu Feb 6 18:02:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 20153 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 9B445168DC; Thu, 6 Feb 2020 18:04:15 +0000 (GMT) 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,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 ESMTP id 1635216397 for ; Thu, 6 Feb 2020 18:04:15 +0000 (GMT) Received: from localhost ([::1]:44062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izlVe-0001nj-IR for patchwork@mira.cbaines.net; Thu, 06 Feb 2020 13:04:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53811) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izlVV-0001m5-DV for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izlVT-00016J-T2 for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izlVT-000154-HD for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1izlVT-0000Ak-Dz for guix-patches@gnu.org; Thu, 06 Feb 2020 13:04:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39456] [PATCH 3/6] gnu: binutils: Update to 2.34. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2020 18:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39456 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39456@debbugs.gnu.org Received: via spool by 39456-submit@debbugs.gnu.org id=B39456.1581012189573 (code B ref 39456); Thu, 06 Feb 2020 18:04:03 +0000 Received: (at 39456) by debbugs.gnu.org; 6 Feb 2020 18:03:09 +0000 Received: from localhost ([127.0.0.1]:48417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izlUV-000090-Eo for submit@debbugs.gnu.org; Thu, 06 Feb 2020 13:03:09 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:48257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izlUN-00007Z-N4 for 39456@debbugs.gnu.org; Thu, 06 Feb 2020 13:03:01 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 97EBC21AF1 for <39456@debbugs.gnu.org>; Thu, 6 Feb 2020 13:02:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 06 Feb 2020 13:02:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm2; bh= F7slfWjt2YSdjJPwYJlvfJK0CBrHvQ/pDtVilRD/OAo=; b=SZ8QYIF0u6m0K6+V 8MuzA6K75qJQRGKhGW+RArA264+H9P5sts8LqqVjJs04LvL9qs6KtuvkFq0JMyTC VZje72tceE/CeUbyGiTxkhUjtM6RmWiRXvR5jHzFwT7T+8lIcj44kl8sPfvMqQnd /g++W+6qcEwhrXYP7VOprrhVQpmQ0NYFFIjkDlXqhdPXwyPWYfhiyLGPudC/RHma /hh0OdolXVQEwh/K9SBIbPL+nXnauTXdGEGBmtc18JVek7XF38W+SsiwKKBNGKDo UX/L+qn/hxvPb/A4Sjj27VRwULMarmvGzMK3CAb5K+KUvIXdkAwxqI/Hnm3mE91k Pndk4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=F7slfWjt2YSdjJPwYJlvfJK0CBrHvQ/pDtVilRD/O Ao=; b=KoCfYsk1S+ZiQREjg0KIhDkVZ0WG4sQqfmqId3qliBbYgX3dYhwbwDFd/ L3ief9OYxv0r6KKF7EkwHzJzkb77EPhMyPWDc7+teBxyCr+IY8XnBzTgvfUQ2eSB qYamfElkIjC560h6WQJp6CaF4rJ8ffX4OddzvZsNu7UB4Ud603o1BxtQZ3gEAYnz YGyEmB2HLQiec10iSPZC+DFL/wX2bf+k4Q9vt1sQwyFJnS5boKo4zkDGHbfSMeCk 64RPd37kO7ajyovz+heLV8ONNe0dyDftdH0nGBO+1QOIKAfq/VvFmXF60692faUS /chghz55C2Opx3anc+fKzuJDbhYmQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrheefgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmqeenucffohhmrghinhepshhouhhrtggvfigrrhgvrdhorhhgpd hgnhhurdhorhhgnecukfhppeekgedrvddtvddrieelrddvheefnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrg hilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D4D230606FB for <39456@debbugs.gnu.org>; Thu, 6 Feb 2020 13:02:50 -0500 (EST) From: Marius Bakke Date: Thu, 6 Feb 2020 19:02:42 +0100 Message-Id: <20200206180245.12470-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200206180245.12470-1-mbakke@fastmail.com> References: <20200206180245.12470-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/base.scm (binutils): Update to 2.34. [arguments]: Add #:make-flags. [properties]: New field. (binutils+documentation): New public variable. --- gnu/packages/base.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 45f6cf79ba..a37b10153e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -399,14 +399,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.33.1") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c")) + "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) @@ -431,7 +431,17 @@ change. GNU make offers many powerful extensions over the standard utility.") ;; Make sure 'ar' and 'ranlib' produce archives in a ;; deterministic fashion. - "--enable-deterministic-archives"))) + "--enable-deterministic-archives") + + ;; XXX: binutils 2.34 was mistakenly released without generated manuals: + ;; . To avoid a + ;; circular dependency on texinfo, prevent the build system from creating + ;; the manuals by calling "true" instead of "makeinfo"... + #:make-flags '("MAKEINFO=true"))) + + ;; ...and "hide" this package so that users who install binutils get the + ;; version with documentation defined below. + (properties '((hidden? . #t))) (synopsis "Binary utilities: bfd gas gprof ld") (description @@ -444,6 +454,18 @@ included.") (license gpl3+) (home-page "https://www.gnu.org/software/binutils/"))) +;; Work around a problem with binutils 2.34 whereby manuals are missing from +;; the release tarball. Remove this and the related code above when updating. +(define-public binutils+documentation + (package/inherit + binutils + (native-inputs + `(("texinfo" ,texinfo))) + (arguments + (substitute-keyword-arguments (package-arguments binutils) + ((#:make-flags _ ''()) ''()))) + (properties '()))) + (define-public binutils-gold (package (inherit binutils)