From patchwork Mon Jul 3 20:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 14526 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 DE9C427BBE2; Mon, 3 Jul 2023 21:53:25 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 00C4127BBE9 for ; Mon, 3 Jul 2023 21:53:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGQXi-0006jj-Tp; Mon, 03 Jul 2023 16:53:08 -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 1qGQXf-0006hj-5d for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGQXe-0006cq-TQ for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGQXe-0005HT-Pd for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 20:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64374@debbugs.gnu.org Cc: Sughosha Received: via spool by 64374-submit@debbugs.gnu.org id=B64374.168841756320252 (code B ref 64374); Mon, 03 Jul 2023 20:53:02 +0000 Received: (at 64374) by debbugs.gnu.org; 3 Jul 2023 20:52:43 +0000 Received: from localhost ([127.0.0.1]:34553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXK-0005Ga-Uh for submit@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXF-0005Fx-Bf for 64374@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:39 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E222240E67; Mon, 3 Jul 2023 22:52:33 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J0kQA6vpxcmA; Mon, 3 Jul 2023 22:52:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1688417552; bh=BJ5iTx0/CBKRtb541T1OLt84aV01dXKf5GDJrOreuIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e4ElIEQ3xHGMc9l5gc+1bXjVuUPYO4URcGBRS1waoIIEETr1aJ9dJCIn5UEqGvUlK gFXJ+JurMiC99CXTuUNqzn7BzkYW65zhcQmJSB8L9bTwhH7vy2BOQk3N0o5XhM+7Hz XElhfeJslIE5cAGv2PYlFOLA/tTZfJuzzxaii61OjxwftWZEV3IA16m9YFGWr0DBel xAEWPeUBG4hMLFB94UgjZ5Zb/oDR0zAIT7LHiak0OlFJNgl2CORkwKmkcAYsObkIaF E9ZgqZwW1r+hb0XIT/DOJH2Nmjiq5iKVZJEHt7ruMNCDGh3P9icNnmI8S0U91LnM8W /Dh/BWHWABVgQ== Date: Mon, 3 Jul 2023 22:52:19 +0200 Message-Id: <7d3a663f9e847009e20a2161227faa33daca91df.1688416868.git.sughosha@disroot.org> In-Reply-To: References: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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 * gnu/packages/audio.scm (ardour)[#:phases]: Move ardour-rpath-phase inside this definition. (ardour-rpath-phase): Delete variable. --- gnu/packages/audio.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 25fa8acf33..b08827b133 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -720,21 +720,6 @@ (define-public qm-dsp purposes developed at Queen Mary, University of London.") (license license:gpl2+))) -(define (ardour-rpath-phase major-version) - `(lambda* (#:key outputs #:allow-other-keys) - (let ((libdir (string-append (assoc-ref outputs "out") - "/lib/ardour" ,major-version))) - (substitute* "wscript" - (("linker_flags = \\[\\]") - (string-append "linker_flags = [\"" - "-Wl,-rpath=" - libdir ":" - libdir "/backends" ":" - libdir "/engines" ":" - libdir "/panners" ":" - libdir "/surfaces" ":" - libdir "/vamp" "\"]")))))) - (define ardour-bundled-media (origin (method url-fetch) @@ -776,7 +761,20 @@ (define-public ardour #:phases (modify-phases %standard-phases (add-after 'unpack 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-major version))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((libdir (string-append (assoc-ref outputs "out") + "/lib/ardour" + ,(version-major version)))) + (substitute* "wscript" + (("linker_flags = \\[\\]") + (string-append "linker_flags = [\"" + "-Wl,-rpath=" + libdir ":" + libdir "/backends" ":" + libdir "/engines" ":" + libdir "/panners" ":" + libdir "/surfaces" ":" + libdir "/vamp" "\"]")))))) (add-after 'install 'install-freedesktop-files (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))