From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] pulseaudio: fix rpath if daemon is not installed
Date: Tue, 2 May 2023 09:06:07 +0200 [thread overview]
Message-ID: <20230502070607.316521-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230425142511.1134675-1-m.tretter@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
prev parent reply other threads:[~2023-05-02 7:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 14:25 [ptxdist] [PATCH] " Michael Tretter
2023-05-02 7:06 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230502070607.316521-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox