[vlc-commits] [Git][videolan/vlc][master] contrib: protobuf: fix path to protoc executable

Steve Lhomme (@robUx4) gitlab at videolan.org
Fri Apr 19 12:54:06 UTC 2024



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
1f6ad291 by Alexandre Janniaux at 2024-04-19T11:11:45+00:00
contrib: protobuf: fix path to protoc executable

protoc path was set to $(HOST)-protoc but it was changed to protoc and
cannot be found anymore by meson after that.

Regression from 38c15b26f8101b8b7e7bd4fff96e90f7fee9ac42.

- - - - -


1 changed file:

- contrib/src/protobuf/rules.mak


Changes:

=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -18,7 +18,7 @@ ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += protoc
 endif
 endif
-PKGS.tools.protoc.path = $(BUILDBINDIR)/$(HOST)-protoc
+PKGS.tools.protoc.path = $(BUILDBINDIR)/protoc
 
 ifeq ($(shell protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(PROTOBUF_MAJVERSION))
 PKGS_FOUND += protoc



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/1f6ad2919344f0baa958356472ee6d4aa7de1a34

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


VideoLAN code repository instance


More information about the vlc-commits mailing list