From patchwork Thu Aug 31 04:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53333 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 B54F227BBE9; Thu, 31 Aug 2023 05:47:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 905DF27BBE2 for ; Thu, 31 Aug 2023 05:47:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZa5-00024J-EN; Thu, 31 Aug 2023 00:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZa3-00023C-Of for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZa3-000359-42 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZaB-0000pB-0u for guix-patches@gnu.org; Thu, 31 Aug 2023 00:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65646] [PATCH 2/3] gnu: aalib: Really build the shared library on powerpc64le-linux. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65646 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65646@debbugs.gnu.org, maxim.cournoyer@gmail.com Cc: Marcel van der Boom X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16934571833088 (code B ref -1); Thu, 31 Aug 2023 04:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 04:46:23 +0000 Received: from localhost ([127.0.0.1]:54561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZW-0000nk-LG for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZT-0000nU-B5 for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZZF-0001st-TT for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:05 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZZC-00030b-5J for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:05 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-76f14d80ea6so24955485a.2 for ; Wed, 30 Aug 2023 21:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693457161; x=1694061961; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pYc+TieB/ja9cyZ0VqfIQarfNzVdLrku1htNKeLp9o=; b=M3HXp6iJLNl/CrPnm2nQENObP1gTQmVrg5nNKL2eBAYyG/Nhu6o2Pu5N03osPBMshV X9mZxDfw4QVIyas9zrlYVP62ZEj8zSj/PxCidZxyepl2jbsXlZiRevY9MtEDT1pNnClM e2AqKts0MBjuravg1fDo8f/TACvOs3Vrpw86Hw8SAdotVgyC7L5sUrm/MeemcdhJQcuk 4JWCCU0oVYcjfJFV7m3K/cm3BRHqpZI3o2XlrCEJWRgzg9rxKGPkAFBrzHiPlStT8JgX vpRA6O/lzEkCaBbc7uxydMXBJaWWS6od96pkot5WaBDuVziwD+hxKVW70av8EJaGskOj MPTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693457161; x=1694061961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pYc+TieB/ja9cyZ0VqfIQarfNzVdLrku1htNKeLp9o=; b=fpInDejtVEe8PaBoAjJBpAvXaEqETOzFT/630eqfMTKXOfM5uRxNlgMcNie3UcTxjM 1cG7+zNTTW3d7Ls1E1eGrVPRSEQJkje4u6+TTS3YsfncYgL3g4Sjd+kwhln1sYIqv8aF n5/bmNus9Z537ZGV6kV8QcLIhVOyON/4zA7eUoqJTAP3TW7m1wzvAu6av6wneLpA/foL KiEi55XkMWtaCECvtU07HVNAL4IOe5B6yOB8S4c8LxdMwlRUkg2/NXzkcpFXaIYW1J1Z h+G0C9J1DCv2gJOACnNQmRpbhxpznmylnNTOj4PYxQqmutw35agu3zk0eoQDY58pjNTY P5rw== X-Gm-Message-State: AOJu0YzooFuBukIYSajshXE5DbtCDLfNVRb7LT0RIE1w2vPwL04ceqIw kXyBu0pMxXJP6vgzV+xf4iJ6rwaVtPo= X-Google-Smtp-Source: AGHT+IGZvUNSEFAzNvW3VVLPEax5DF8AUnHoWZiIz8h0M/dnp1mnRgNqx00M1jViO642u/S+ewXYUw== X-Received: by 2002:a05:620a:44d1:b0:767:f49c:1d67 with SMTP id y17-20020a05620a44d100b00767f49c1d67mr2092668qkp.1.1693457161015; Wed, 30 Aug 2023 21:46:01 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-23.b2b2c.ca. [72.10.128.23]) by smtp.gmail.com with ESMTPSA id p17-20020a0ce191000000b0064f4d3bc78csm277003qvl.61.2023.08.30.21.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:46:00 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 31 Aug 2023 00:45:27 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> References: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes . The old build scripts were buggy and causing a static library to be produced instead, which would fail to be linked by gst-plugins-good. * gnu/packages/video.scm (aalib) [native-inputs]: Remove labels. [arguments]: Use gexps. : New argument. : Remove update-config-scripts and configure override. Add force-autoreconf. Reported-by: Marcel van der Boom --- gnu/packages/video.scm | 43 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ff52b9b38d..1a0880bf3c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -50,7 +50,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021, 2022, 2023 Andrew Tropin ;;; Copyright © 2021 David Wilson -;;; Copyright © 2021,2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Thiago Jung Bauermann @@ -745,36 +745,19 @@ (define-public aalib (base32 "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv")))) (build-system gnu-build-system) - (native-inputs - `(("config" ,config) - ("makeinfo" ,texinfo))) - (inputs - (list 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 - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out")) - (ncurses (assoc-ref inputs "ncurses"))) - (setenv "CONFIG_SHELL" (which "bash")) - (invoke "./configure" - "--disable-static" - (string-append "--prefix=" out) - (string-append "--build=" build) - (string-append "--with-ncurses=" - ncurses)))))))) + (list + #:configure-flags + #~(list "--disable-static" + (string-append "--with-ncurses=" + #$(this-package-input "ncurses"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'force-autoreconf + (lambda _ + (delete-file "configure")))))) + (native-inputs (list autoconf automake libtool texinfo)) + (inputs (list ncurses)) (home-page "https://aa-project.sourceforge.net/aalib/") (synopsis "ASCII-art library") (description