unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#64576] [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so
@ 2023-07-11 19:34 nathan via Guix-patches via
  2023-09-06  4:01 ` bug#64576: " Maxim Cournoyer
  0 siblings, 1 reply; 2+ messages in thread
From: nathan via Guix-patches via @ 2023-07-11 19:34 UTC (permalink / raw)
  To: 64576

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

fix bug#64409
In libusb-compat-0.1.8/libusb/libusb-dload.h, dlopen is used to load libusb.
We need to specify an absolute path.
With this fix, teensy_loader_cli doesn't immediately fail with a missing library error.
./pre-inst-env guix shell teensy-loader-cli -- teensy_loader_cli
If you merge the patch from bug#64563 first, you can't test this patch with teensy_loader_cli.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-libusb-compat-Compile-with-full-path-of-libusb-1.patch --]
[-- Type: text/x-patch, Size: 1076 bytes --]

From c0a8ecea0ce6f3954061a3d061a3243fa65c6cfb Mon Sep 17 00:00:00 2001
From: nathan <nathan_mail@nborghese.com>
Date: Mon, 10 Jul 2023 23:22:48 -0400
Subject: [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so

* gnu/packages/libusb.scm (libusb) [configure-flags]: Provide full path of
  libusb-1.0.so so dlopen works.
---
 gnu/packages/libusb.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index d0837c8a91..39586147ba 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -101,7 +101,10 @@ (define-public libusb-compat
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-           #~(list "--disable-static")))
+           #~(list "--disable-static"
+                   (string-append "LIBUSB_1_0_SONAME="
+                                  #$(this-package-input "libusb")
+                                  "/lib/libusb-1.0.so"))))
     (native-inputs
      (list autoconf automake libtool pkg-config))
     (inputs
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#64576: [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so
  2023-07-11 19:34 [bug#64576] [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so nathan via Guix-patches via
@ 2023-09-06  4:01 ` Maxim Cournoyer
  0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2023-09-06  4:01 UTC (permalink / raw)
  To: nathan; +Cc: 64576-done

Hi,

nathan <nathan_mail@nborghese.com> writes:

> fix bug#64409
> In libusb-compat-0.1.8/libusb/libusb-dload.h, dlopen is used to load libusb.
> We need to specify an absolute path.
> With this fix, teensy_loader_cli doesn't immediately fail with a missing library error.
> ./pre-inst-env guix shell teensy-loader-cli -- teensy_loader_cli
> If you merge the patch from bug#64563 first, you can't test this patch with teensy_loader_cli.
>
>>From c0a8ecea0ce6f3954061a3d061a3243fa65c6cfb Mon Sep 17 00:00:00 2001
> From: nathan <nathan_mail@nborghese.com>
> Date: Mon, 10 Jul 2023 23:22:48 -0400
> Subject: [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so
>
> * gnu/packages/libusb.scm (libusb) [configure-flags]: Provide full path of
>   libusb-1.0.so so dlopen works.
> ---
>  gnu/packages/libusb.scm | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
> index d0837c8a91..39586147ba 100644
> --- a/gnu/packages/libusb.scm
> +++ b/gnu/packages/libusb.scm
> @@ -101,7 +101,10 @@ (define-public libusb-compat
>      (build-system gnu-build-system)
>      (arguments
>       (list #:configure-flags
> -           #~(list "--disable-static")))
> +           #~(list "--disable-static"
> +                   (string-append "LIBUSB_1_0_SONAME="
> +                                  #$(this-package-input "libusb")
> +                                  "/lib/libusb-1.0.so"))))
>      (native-inputs
>       (list autoconf automake libtool pkg-config))
>      (inputs

Interesting!  I fixed this independently with ddd8bb104, using a RUNPATH
approach.  Yours is a better solution, now applied :-).

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-09-06  4:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-11 19:34 [bug#64576] [PATCH] gnu: libusb-compat: Compile with full path of libusb-1.0.so nathan via Guix-patches via
2023-09-06  4:01 ` bug#64576: " Maxim Cournoyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).