new buildsystem merged into master

Thiago Macieira thiago at macieira.org
Wed Oct 9 16:15:46 UTC 2013


On quarta-feira, 9 de outubro de 2013 16:07:04, Dirk Hohndel wrote:
> diff --git a/subsurface-configure.pri b/subsurface-configure.pri
> index b70107f..045c9b1 100644
> --- a/subsurface-configure.pri
> +++ b/subsurface-configure.pri
> @@ -48,9 +48,9 @@ PKG_CONFIG_OUT = $$system(pkg-config --version 2>
> $$NUL)
>      # about it if it doesn't.
>      LIBS += $$system(pkg-config --libs libusb-1.0 2> /dev/null)
>  } else:exists(/usr/local/lib/libdivecomputer.a) {
> -    LIBS += -L/usr/local/lib -ldivecomputer
> +    LIBS += /usr/local/lib/libdivecomputer.a
>  } else:exists(/usr/local/lib64/libdivecomputer.a) {
> -    LIBS += -L/usr/local/lib64 -ldivecomputer
> +    LIBS += /usr/local/lib64/libdivecomputer.a
>  } else:link_pkgconfig {
>      # find it via pkg-config
>      PKGCONFIG += libdivecomputer

We should also advise people to build it with --disable-shared.

If the .so file is not present, ld will link to the static version.

-- 
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: 0001-Advise-people-to-compile-libdivecomputer-only-static.patch
Type: text/x-patch
Size: 1295 bytes
Desc: not available
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/aba3f4d8/attachment.bin>
-------------- 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/aba3f4d8/attachment.sig>


More information about the subsurface mailing list