[vlc-commits] [Git][videolan/vlc][master] 3 commits: cargo-test: fix -rpath

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
03a1f149 by Alexandre Janniaux at 2026-05-10T12:44:33+02:00
cargo-test: fix -rpath

It seems that I didn't properly tested the change with gcc, which
refuses ',rpath' but access ',-rpath'.

- - - - -
201c9455 by Alexandre Janniaux at 2026-05-10T12:44:33+02:00
rust: Makefile.am: call python3 explicitely

- - - - -
25053fd2 by Alexandre Janniaux at 2026-05-10T12:44:33+02:00
meson: fix how rust flags are provided

When providing a meson list [] to an environment variable, meson will
convert the list by calling ':'.join(list), but for compiler arguments,
we actually need to provide them with space separators.

- - - - -


5 changed files:

- buildsystem/cargo-test.py
- modules/meson.build
- src/rust/Makefile.am
- src/rust/vlcrs-core/meson.build
- src/rust/vlcrs-macros/meson.build


Changes:

=====================================
buildsystem/cargo-test.py
=====================================
@@ -50,7 +50,7 @@ cmd = ['cargo', 'test',
        '--offline', '--locked',
        '--config', f'target.{rust_triple}.vlccore.rustc-link-lib=["vlccore"]',
        '--config', f'target.{rust_triple}.vlccore.rustc-link-search=["{lib_dir}"]',
-       '--config', f'target.{rust_triple}.vlccore.rustc-link-arg=["-Wl,rpath,{lib_dir}"]',
+       '--config', f'target.{rust_triple}.vlccore.rustc-link-arg=["-Wl,-rpath,{lib_dir}"]',
        '--color', 'always' if args.color_tests == 'yes' else 'never',
        '--package', test_name,
        '--',


=====================================
modules/meson.build
=====================================
@@ -545,7 +545,7 @@ if get_option('rust').enabled()
             depfile: 'lib' + module['name'] + '.d',
             output: 'lib' + module['name'] + '.a',
             env: {
-              'RUSTFLAGS': rust_flags,
+              'RUSTFLAGS': ' '.join(rust_flags),
               'CARGO_TARGET_DIR': cargo_target_dir,
             },
             command: [cargo_output, '--output', '@OUTDIR@', '--depfile',


=====================================
src/rust/Makefile.am
=====================================
@@ -1,6 +1,6 @@
 TEST_EXTENSIONS += .cargo
 CARGO_LOG_DRIVER = env top_builddir="${abs_top_builddir}" \
-                   $(abs_top_srcdir)/buildsystem/cargo-test.py \
+                   python3 $(abs_top_srcdir)/buildsystem/cargo-test.py \
                    --host="@RUST_TARGET@" \
                    --working-directory="${abs_top_srcdir}/src/rust/"
 


=====================================
src/rust/vlcrs-core/meson.build
=====================================
@@ -17,7 +17,7 @@ vlcrs_core = custom_target('vlcrs_core-cargo',
     depfile: 'libvlcrs_core.d',
     depends: module_cargo_depends,
     env: {
-      'RUSTFLAGS': rust_flags,
+      'RUSTFLAGS': ' '.join(rust_flags),
       'CARGO_TARGET_DIR': cargo_target_dir
     },
     command: [cargo_output, '--output', '@OUTDIR@', '--depfile',


=====================================
src/rust/vlcrs-macros/meson.build
=====================================
@@ -20,7 +20,7 @@ vlcrs_core_macros = custom_target('vlcrs_macros-cargo',
     output: 'libvlcrs_macros. at 0@'.format(rust_macros_extension),
     depends: module_cargo_depends,
     env: {
-      'RUSTFLAGS': rust_flags,
+      'RUSTFLAGS': ' '.join(rust_flags),
       'CARGO_TARGET_DIR': cargo_target_dir
     },
     command: [cargo_output, '--output', '@OUTDIR@', '--depfile',



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2802f1582588ed1c822cda8b4876c7ece5424fac...25053fd26c35d54f96e0564ab5c126282013498e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2802f1582588ed1c822cda8b4876c7ece5424fac...25053fd26c35d54f96e0564ab5c126282013498e
You're receiving this email because of your account on code.videolan.org.