[PATCH 2/5] subsurface-configure.pri: enable the libusb detection stage

Thiago Macieira thiago at macieira.org
Wed Oct 9 12:35:02 UTC 2013


On quarta-feira, 9 de outubro de 2013 21:35:49, Lubomir I. Ivanov wrote:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
> 
> The commented out step should work as expected (in theory).
> 
> Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
> ---
>  subsurface-configure.pri | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/subsurface-configure.pri b/subsurface-configure.pri
> index 88907c1..00222da 100644
> --- a/subsurface-configure.pri
> +++ b/subsurface-configure.pri
> @@ -59,7 +59,7 @@ PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL)
>  # And libdivecomputer is only built with it if libusb-1.0 is
>  # installed. So get libusb if it exists, but don't complain
>  # about it if it doesn't.
> -#link_pkgconfig: packagesExist(libusb-1.0): PKGCONFIG += libusb-1.0
> +link_pkgconfig: packagesExist(libusb-1.0): PKGCONFIG += libusb-1.0

Shouldn't be necessary after the changes done a little above.

I had been wondering why we had this dependency, since none of our code uses 
libusb. Looks like it's there for the static linking of libdivecomputer.

Now the libdivecomputer static linking has been fixed. Can you recheck?
-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
   Software Architect - Intel Open Source Technology Center
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/e29bb053/attachment.sig>


More information about the subsurface mailing list