Re: [ptxdist] [APPLIED] pulseaudio: fix rpath if daemon is not installed

[Michael Olbrich <m.olbrich@pengutronix.de>]

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