[vlc-commits] [Git][videolan/vlc][master] Revert "contrib: regenerate the meson contrib file to use local pathes with the tools"

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
4f97c9d3 by Steve Lhomme at 2024-12-06T07:05:43+01:00
Revert "contrib: regenerate the meson contrib file to use local pathes with the tools"

The dependencies to build meson-machinefile/contrib.ini builds some target
contribs packages when we only want to get the ini file alongside the native
tools.

This fails to build on Android because when using prebuilt contribs the
target compiler is not setup (config.mak) since it's not supposed to be used.

This reverts commit 51ff3023cc7f8e4a82b05a2df0c21dadb673c75b.

- - - - -


1 changed file:

- contrib/src/meson-machinefile/rules.mak


Changes:

=====================================
contrib/src/meson-machinefile/rules.mak
=====================================
@@ -6,8 +6,6 @@
 # respectively.
 
 PKGS += meson-machinefile
-# regenerate the meson contrib file to use local pathes with the tools
-PKGS_TOOLS += meson-machinefile
 
 ifdef HAVE_CROSS_COMPILE
 CROSS_OR_NATIVE := cross



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4f97c9d3fac7a4a5b516300e5fe97786626ac850

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4f97c9d3fac7a4a5b516300e5fe97786626ac850
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance