| Message ID | 20240224183650.3571984-1-joakim.tjernlund@infinera.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 15032315f35c44820952a9750baf58c2b4090b3f |
| Headers | show |
| Series | cups: Use pkg-config to find cups backend dir | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=829501 ---Test result--- Test Summary: CheckPatch PASS 0.42 seconds GitLint PASS 0.31 seconds BuildEll PASS 23.94 seconds BluezMake PASS 723.49 seconds MakeCheck PASS 11.79 seconds MakeDistcheck PASS 164.00 seconds CheckValgrind PASS 228.53 seconds CheckSmatch PASS 332.63 seconds bluezmakeextell PASS 108.23 seconds IncrementalBuild PASS 672.66 seconds ScanBuild PASS 966.78 seconds --- Regards, Linux Bluetooth
Hello: This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Sat, 24 Feb 2024 19:35:50 +0100 you 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(-) Here is the summary with links: - cups: Use pkg-config to find cups backend dir https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=15032315f35c You are awesome, thank you!
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
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 AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], [enable Mesh profile support]), [enable_mesh=${enableval}])
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(-)