From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8HB1C0U1o2TPrwAASxT56A (envelope-from ) for ; Mon, 03 Jul 2023 22:53:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ALO1CkU1o2RpTgEAG6o9tA (envelope-from ) for ; Mon, 03 Jul 2023 22:53:25 +0200 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 E59B729B46 for ; Mon, 3 Jul 2023 22:53:24 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=e4ElIEQ3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688417604; a=rsa-sha256; cv=none; b=qvTIf9Zzo1jswX5mXovC4zzn/hOk7TuAE/Tash2zk7W039ohTxzYFvxjVPYEm7ZUKL2jXE CDpAo9OflVeL+eZNta6oC2tTCotKozqX5guDFCaT3pshXRMZQlcPSKOYoI5dav5y1d1FAn HmC2g6Mv3TBZET/jY2wOGARjT7Jn5sJ71Ed5ejS+IfFTIFO619ZLJja+Oidv2kPP7Am8ZA 3kHefiE2hnE9nAPRmPFLmZVaExl3tGzweDpbQUtxDOSbXd7THNgvBIinA7Dr3Qo4+wrIvO pmvzcA5BETaiDMEMpbI63j4xPhYTIUxoUi1GGt3rCSjXz1HRLrT3i6AzftLBcA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=e4ElIEQ3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688417604; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=GYEEBlAdrlvYLMgaV12ubnhj40wKHqcYEBQH7I2UDOE=; b=eRguy4uJS7y2CTIWb7Q2B6cNx8vkQUZ/R3JmUkpjdmma8pCIpfMdYFZzkRoqo8J5et5V4/ CJIAWHIZDOQbMKKpfWA0WMVZy7aH0QjU+HDzfNDhUHPHgx+oBCoUxnwfOUQKzL3Tl/B8h2 CSntzW3cfX49ZJ4KgulwATO167Amp4IizcVHqp9x5QAkbAlwJyJSsrwZaPeImM6YtTp7i/ ERzxizrPSi8mGOqLxTl1LeLsuzxAcX/mZpFFlvStGGrzG+WhUbFPLWhU+hLiSXouA6tDUF W8zI3wAYL3U6ApnnHC1Pi/HKFxOxPfpBS7oF6rFCxKdIxevh9x5J6zRYec8HqA== 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 Content-Transfer-Encoding: 8bit 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 From: Sughosha via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.26 X-Migadu-Queue-Id: E59B729B46 X-Spam-Score: -3.26 X-TUID: brYWlb0J8jht * 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")) -- 2.40.1