summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-05-09 10:00:20 +0300
committerArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-05-09 14:15:50 +0300
commitc60d4610424ff8ac227a276f2da3f62e4b8d4d65 (patch)
tree58b932c255a0f8fcfef0c8c7d49f9bc6aa6c2035
parent23200bc1b008542bd4d744755540b07881d41fae (diff)
meson: Explicitly require libcurl for chamelium
Chamelium uses xmlrpc client which: $ xmlrpc-c-config client --libs -L/usr/lib/x86_64-linux-gnu -lxmlrpc_client -lxmlrpc -lxmlrpc_xmlparse -lxmlrpc_xmltok -lxmlrpc_util -lcurl Debian/Ubuntu (and perhaps others) lack dependency on libcurl-dev: $ apt depends libxmlrpc-core-c3-dev Depends: libxmlrpc-core-c3 (= 1.33.14-4) Suggests: xmlrpc-api-utils $ apt depends libxmlrpc-core-c3 libxmlrpc-core-c3 Depends: libc6 (>= 2.14) Depends: libcurl3 (>= 7.16.2) Which causes: /usr/bin/ld: cannot find -lcurl collect2: error: ld returned 1 exit status [14/711] Compiling C object 'tests/59830eb@@kms_atomic@exe/kms_atomic.c.o'. ninja: build stopped: subcommand failed. Debian's `reportbug` was used to report this issue. Meanwhile we can explicitly ask for libcurl. Cc: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r--meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 8196ab63..cbc37f7e 100644
--- a/meson.build
+++ b/meson.build
@@ -196,6 +196,7 @@ chameliuminfo = 'No'
if _build_chamelium
gsl = dependency('gsl', required : _chamelium_required)
alsa = dependency('alsa', required : _chamelium_required)
+ libcurl = dependency('libcurl', required : _chamelium_required)
chamelium = declare_dependency(dependencies : [
xmlrpc,
xmlrpc_util,
@@ -203,7 +204,7 @@ if _build_chamelium
gsl,
alsa,
], required : _chamelium_required)
- if xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() and gsl.found() and alsa.found()
+ if xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() and gsl.found() and alsa.found() and libcurl.found()
config.set('HAVE_CHAMELIUM', 1)
chameliuminfo = 'Yes'
chamelium_found = true