* [ptxdist] [PATCH] pulseaudio: fix rpath if daemon is not installed
@ 2023-04-25 14:25 Michael Tretter
2023-05-02 7:06 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Michael Tretter @ 2023-04-25 14:25 UTC (permalink / raw)
To: ptxdist; +Cc: mtr
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>
---
rules/pulseaudio.make | 4 ++++
1 file changed, 4 insertions(+)
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
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] pulseaudio: fix rpath if daemon is not installed
2023-04-25 14:25 [ptxdist] [PATCH] pulseaudio: fix rpath if daemon is not installed Michael Tretter
@ 2023-05-02 7:06 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-05-02 7:06 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-02 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-25 14:25 [ptxdist] [PATCH] pulseaudio: fix rpath if daemon is not installed Michael Tretter
2023-05-02 7:06 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox