From patchwork Tue Aug 17 04:55:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 32137 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 7039627BC78; Tue, 17 Aug 2021 05:57:16 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 08A0827BC6B for ; Tue, 17 Aug 2021 05:57:16 +0100 (BST) Received: from localhost ([::1]:40080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFrA3-0000GC-2C for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 00:57:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFr9q-00006i-SF for guix-patches@gnu.org; Tue, 17 Aug 2021 00:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFr9q-0007oG-Ld for guix-patches@gnu.org; Tue, 17 Aug 2021 00:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFr9q-0001iP-Ke for guix-patches@gnu.org; Tue, 17 Aug 2021 00:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50086] [PATCH 2/2] gnu: aalib: Update =?utf-8?b?4oCYY29uZmln?= =?utf-8?b?Lmd1ZXNz4oCZ?= and =?utf-8?b?4oCYY29uZmlnLnN1YuKAmQ==?= Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 04:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50086@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 50086-submit@debbugs.gnu.org id=B50086.16291762056561 (code B ref 50086); Tue, 17 Aug 2021 04:57:02 +0000 Received: (at 50086) by debbugs.gnu.org; 17 Aug 2021 04:56:45 +0000 Received: from localhost ([127.0.0.1]:51293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFr9Y-0001hl-JM for submit@debbugs.gnu.org; Tue, 17 Aug 2021 00:56:44 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:54752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFr9W-0001hV-8j for 50086@debbugs.gnu.org; Tue, 17 Aug 2021 00:56:43 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 94EBA15C9 for <50086@debbugs.gnu.org>; Tue, 17 Aug 2021 06:56:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1629176191; x=1630990592; bh=0XsUXxr1p9dyg5CoM5z5CZNfWzj9bnkMu+9 BnbjXv5Q=; b=23wPYuditYND5vat2mhgZYGZUONWaOlvsPx2GU3rAclJhB7jG6c x3NjGiWDZTARny7Qv0V1klpS0HpCLfqlBaJNGuriwU4PjqtZrg5L45/RN0k/EjB/ ixcVdxF0h9B6+y8PJgmM8U5gTPtsPFqgF5BWYrivjgHQ12Bzo7NwM75IommFKQTX ltGqAdFkAgd+XjYIWV61PAWq1UzlWxUAmj1UUn/97ecDv7/ejFzprncIITRUTmQZ jMqpTjnBBJQ5w0i8ylNewh5hesp6FkUaZ3CDlYz+Wy/vlAkajRwmrtrgHuEkg/Si 35yE4unjdfkkt4+fOpBk426+bTToWDPkjcJXAMjJJIdAnnaZemgY8r/rZEoR3DFM dodJ7raW99MTv5AXrdl++5b2IamqIa4KLq8HgBJ7FLtSHIZP0hqW+Se7IU87gQTv fpBf9LriqRbYYP9zM3w+09Pi/SPqOwNwBUy6UMVoLle8RamPyNdIJhzrE4PRCG6d XGTv8I6UEG/ZZL3N9bQEl8Rs1LUUZjcnOIgEmGX95T7YPbdfq8TGm8WumN6/ZVGW B3EYeO/RPlt///Epq+7AVuiqmQrQf0a440buV1kxxWsccdyVpmByF5JQY+0nzWF0 doSVV2Iqnd0aFLwYUwhUCXyhnGvhnlSCC9RJhDhozAYsByAM/ObouEYM= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z5aVyVQ7dud0 for <50086@debbugs.gnu.org>; Tue, 17 Aug 2021 06:56:31 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 5644F1551 for <50086@debbugs.gnu.org>; Tue, 17 Aug 2021 06:56:31 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 8F4FB4E7E; Tue, 17 Aug 2021 06:56:30 +0200 (CEST) Date: Tue, 17 Aug 2021 01:55:53 -0300 Message-Id: <20210817045553.11746-2-bauermann@kolabnow.com> In-Reply-To: <20210817045553.11746-1-bauermann@kolabnow.com> References: <20210817045553.11746-1-bauermann@kolabnow.com> MIME-Version: 1.0 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The original versions are too old to recognize architectures such as aarch64, mips64el and powerpc64le. * gnu/packages/video.scm (aalib)[native-inputs]: Add ‘config’. [arguments]<#:phases>{update-configure-scripts}: New. {configure}: Don’t set host explicitly. --- Hi, As mentioned in the cover letter, this fixes the build for powerpc64le-linux. I believe it will also work for aarch64-linux and mips64el-linux but I wasn’t able to test on those platforms. Thanks, Thiago gnu/packages/video.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ac6fc14b1f58..2c79daf8845f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 Thiago Jung Bauermann ;;; ;;; This file is part of GNU Guix. ;;; @@ -676,12 +677,21 @@ stream decoding") "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv")))) (build-system gnu-build-system) (native-inputs - `(("makeinfo" ,texinfo))) + `(("config" ,config) + ("makeinfo" ,texinfo))) (inputs `(("ncurses" ,ncurses))) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))) (replace 'configure (lambda* (#:key build inputs outputs #:allow-other-keys) ;; This old `configure' script doesn't support @@ -692,17 +702,6 @@ stream decoding") (invoke "./configure" (string-append "--prefix=" out) (string-append "--build=" build) - ;; The ancient config.guess is unable to - ;; guess the host triplet on mips64el. - ,@(if (string=? "mips64el-linux" - (%current-system)) - '("--host=mips64el-unknown-linux-gnu") - '()) - ;; The same is also true with aarch64. - ,@(if (string=? "aarch64-linux" - (%current-system)) - '("--host=aarch64-unknown-linux-gnu") - '()) (string-append "--with-ncurses=" ncurses)))))))) (home-page "http://aa-project.sourceforge.net/aalib/")