Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-2162-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240224183650.3571984-1-joakim.tjernlund@infinera.com>
In-Reply-To: <20240224183650.3571984-1-joakim.tjernlund@infinera.com>
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 27 Feb 2024 10:46:54 +0000
Message-ID: <CACvgo53rEdP5FqeGMd+xvQar8nF5KwBmd0G3+fcaRNBsmFjsVg@mail.gmail.com>
Subject: Re: [PATCH] cups: Use pkg-config to find cups backend dir
To: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Cc: "linux-bluetooth @ vger . kernel . org" <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"

On Sat, 24 Feb 2024 at 18:36, Joakim Tjernlund
<joakim.tjernlund@infinera.com> wrote:
>
> Some distributions(Gentoo) patch cups backend path to
> something else than libdir. Use pkg-config to find backend
> path for cups.
>
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> ---
>  Makefile.tools | 3 ++-
>  configure.ac   | 3 +++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.tools b/Makefile.tools
> index 044342e29..c17244677 100644
> --- a/Makefile.tools
> +++ b/Makefile.tools
> @@ -538,7 +538,8 @@ endif
>  endif
>
>  if CUPS
> -cupsdir = $(libdir)/cups/backend
> +
> +cupsdir = $(CUPSDIR)
>
>  cups_PROGRAMS = profiles/cups/bluetooth
>
> diff --git a/configure.ac b/configure.ac
> index bb6380f2f..778c27a0f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -242,6 +242,9 @@ AC_SUBST(UDEV_DIR, [${path_udevdir}])
>  AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups],
>                  [disable CUPS printer support]), [enable_cups=${enableval}])
>  AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
> +if (test "${enable_cups}" != "no"); then
> +   AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend)
> +fi
>

This has already landed, so fwiw: the patch looks solid IMHO.
Sorry for the delay Joakim - life got in the way.

-Emil