From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 02 May 2023 09:07:22 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1ptk6d-0026y5-9w
	for lore@lore.pengutronix.de; Tue, 02 May 2023 09:07:22 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1ptk6b-0005Td-FH; Tue, 02 May 2023 09:07:21 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5R-0002UN-CJ; Tue, 02 May 2023 09:06:09 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5Q-000Wp3-Rr; Tue, 02 May 2023 09:06:08 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5P-001KLN-Vo; Tue, 02 May 2023 09:06:07 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Tue,  2 May 2023 09:06:07 +0200
Message-Id: <20230502070607.316521-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230425142511.1134675-1-m.tretter@pengutronix.de>
References: <20230425142511.1134675-1-m.tretter@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] pulseaudio: fix rpath if daemon is not
 installed
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 4ab41c93742dd35f8aef9b745689815b68818a02.

Michael

[sent from post-receive hook]

On Tue, 02 May 2023 09:06:07 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The modules are installed only if the daemon is enabled and installed.
> If the daemon is disabled, the modules won't be installed and the path
> to the modules doesn't exist.
> 
> Don't add the modules directory from the rpath if the directory doesn't
> exist.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20230425142511.1134675-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
> index d33b31a7e3f1..afc3c7496595 100644
> --- a/rules/pulseaudio.make
> +++ b/rules/pulseaudio.make
> @@ -97,7 +97,11 @@ PULSEAUDIO_CONF_OPT	:= \
>  	-Dx11=disabled \
>  	-Dzshcompletiondir=
>  
> +ifdef PTXCONF_PULSEAUDIO_DAEMON
>  PULSEAUDIO_LDFLAGS	:= -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
> +else
> +PULSEAUDIO_LDFLAGS	:= -Wl,-rpath,/usr/lib/pulseaudio
> +endif
>  
>  # ----------------------------------------------------------------------------
>  # Install