From 5edbc0acd717bd3bd4268c5d3a43fb07d6593f54 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 19 Feb 2021 21:23:19 -0800 Subject: tests/rust: Add rust case linking to zlib dependency Reworks: * Add MESON_SKIP_TEST error for darwin from polyglot test * Remove dependencies from executable Dylan's changes: * Add support for both static and shared testing * Test with pkg-config, cmake, and system * reformat to meson's style Co-authored-by: Dylan Baker --- .../13 external c dependencies/c_accessing_zlib.c | 10 ++++++++++ .../rust/13 external c dependencies/meson.build | 23 ++++++++++++++++++++++ .../13 external c dependencies/meson_options.txt | 2 ++ test cases/rust/13 external c dependencies/prog.rs | 9 +++++++++ .../rust/13 external c dependencies/test.json | 15 ++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 test cases/rust/13 external c dependencies/c_accessing_zlib.c create mode 100644 test cases/rust/13 external c dependencies/meson.build create mode 100644 test cases/rust/13 external c dependencies/meson_options.txt create mode 100644 test cases/rust/13 external c dependencies/prog.rs create mode 100644 test cases/rust/13 external c dependencies/test.json diff --git a/test cases/rust/13 external c dependencies/c_accessing_zlib.c b/test cases/rust/13 external c dependencies/c_accessing_zlib.c new file mode 100644 index 0000000..358b989 --- /dev/null +++ b/test cases/rust/13 external c dependencies/c_accessing_zlib.c @@ -0,0 +1,10 @@ +#include +#include +#include + +void c_accessing_zlib(void) { + struct z_stream_s zstream; + printf("Hello from C!\n"); + memset(&zstream, 0, sizeof(zstream)); + inflateInit(&zstream); +} diff --git a/test cases/rust/13 external c dependencies/meson.build b/test cases/rust/13 external c dependencies/meson.build new file mode 100644 index 0000000..e5caf70 --- /dev/null +++ b/test cases/rust/13 external c dependencies/meson.build @@ -0,0 +1,23 @@ +project('rust linking to c using dependency', 'c', 'rust') + +if host_machine.system() == 'darwin' + error('MESON_SKIP_TEST: doesnt work right on macos, please fix!') +endif + +dep_zlib = dependency('zlib', static : get_option('static'), method : get_option('method'), required : false) +if not dep_zlib.found() + error('MESON_SKIP_TEST: Could not find a @0@ zlib'.format(get_option('static') ? 'static' : 'shared')) +endif + +l = static_library( + 'c_accessing_zlib', + 'c_accessing_zlib.c', + dependencies: [dep_zlib], +) + +e = executable( + 'prog', 'prog.rs', + link_with : l, +) + +test('cdepstest', e) diff --git a/test cases/rust/13 external c dependencies/meson_options.txt b/test cases/rust/13 external c dependencies/meson_options.txt new file mode 100644 index 0000000..f501348 --- /dev/null +++ b/test cases/rust/13 external c dependencies/meson_options.txt @@ -0,0 +1,2 @@ +option('static', type : 'boolean') +option('method', type : 'string') diff --git a/test cases/rust/13 external c dependencies/prog.rs b/test cases/rust/13 external c dependencies/prog.rs new file mode 100644 index 0000000..b30ec24 --- /dev/null +++ b/test cases/rust/13 external c dependencies/prog.rs @@ -0,0 +1,9 @@ +extern "C" { + fn c_accessing_zlib(); +} + +fn main() { + unsafe { + c_accessing_zlib(); + } +} diff --git a/test cases/rust/13 external c dependencies/test.json b/test cases/rust/13 external c dependencies/test.json new file mode 100644 index 0000000..ad0e79a --- /dev/null +++ b/test cases/rust/13 external c dependencies/test.json @@ -0,0 +1,15 @@ +{ + "matrix": { + "options": { + "static": [ + { "val": true }, + { "val": false } + ], + "method": [ + { "val": "pkg-config" }, + { "val": "cmake" }, + { "val": "system" } + ] + } + } +} -- cgit v1.1 From 6544f151db7a04993ff75540ed6a0cb2a4573b02 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 23 Feb 2021 10:39:06 -0800 Subject: rust: fix linking with external dependencies Rust can link with any dependency that uses c linkage, which is pretty much what we assume across the board anyway. --- mesonbuild/backend/ninjabackend.py | 17 +++++++++++++++++ test cases/rust/13 external c dependencies/test.json | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 58fd5c6..a0a34b3 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1598,6 +1598,7 @@ int dummy; args += rustc.get_output_args(os.path.join(target.subdir, target.get_filename())) args += self.environment.coredata.get_external_args(target.for_machine, rustc.language) linkdirs = mesonlib.OrderedSet() + external_deps = target.external_deps.copy() for d in target.link_targets: linkdirs.add(d.subdir) if d.uses_rust(): @@ -1609,6 +1610,22 @@ int dummy; # Rust uses -l for non rust dependencies, but we still need to add (shared|static)=foo _type = 'static' if d.typename == 'static library' else 'shared' args += ['-l', f'{_type}={d.name}'] + if d.typename == 'static library': + external_deps.extend(d.external_deps) + for e in external_deps: + for a in e.get_link_args(): + if a.endswith(('.dll', '.so', '.dylib')): + dir_, lib = os.path.split(a) + linkdirs.add(dir_) + lib, ext = os.path.splitext(lib) + if lib.startswith('lib'): + lib = lib[3:] + args.extend(['-l', f'dylib={lib}']) + elif a.startswith('-L'): + args.append(a) + elif a.startswith('-l'): + # This should always be a static lib, I think + args.extend(['-l', f'static={a[2:]}']) for d in linkdirs: if d == '': d = '.' diff --git a/test cases/rust/13 external c dependencies/test.json b/test cases/rust/13 external c dependencies/test.json index ad0e79a..423581f 100644 --- a/test cases/rust/13 external c dependencies/test.json +++ b/test cases/rust/13 external c dependencies/test.json @@ -10,6 +10,9 @@ { "val": "cmake" }, { "val": "system" } ] - } + }, + "exclude": [ + { "static": true, "method": "pkg-config" } + ] } } -- cgit v1.1 From 0edd0058046069f715d753dddee6e6c08e79207d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 23 Feb 2021 11:26:19 -0800 Subject: rust: replace for loop with any() This is a little cleaner, and short circuits correctly, unlike the loop it replaces --- mesonbuild/backend/ninjabackend.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a0a34b3..b7723ef 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1630,10 +1630,7 @@ int dummy; if d == '': d = '.' args += ['-L', d] - has_shared_deps = False - for dep in target.get_dependencies(): - if isinstance(dep, build.SharedLibrary): - has_shared_deps = True + has_shared_deps = any(isinstance(dep, build.SharedLibrary) for dep in target.get_dependencies()) if isinstance(target, build.SharedLibrary) or has_shared_deps: # add prefer-dynamic if any of the Rust libraries we link # against are dynamic, otherwise we'll end up with -- cgit v1.1