[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: gcrypt: use the path to the gpg-error we install

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
2c5e7d3c by Steve Lhomme at 2024-08-01T08:28:04+00:00
contrib: gcrypt: use the path to the gpg-error we install

So we don't have to hardcode the PATH.

- - - - -
ed533041 by Steve Lhomme at 2024-08-01T08:28:04+00:00
Revert "Contribs: export PATH in HOSTVARS because of *-config programs"

This reverts commit 7292c978eea2a5e0e33e88096fbb070d9250ff44.

Most of the time we can't run cross-compiled binaries on the host machine.
We do not use the -config programs as it may have been the case in the past.

We have native binaries in the path since fe47c2f2d6fdcdfd4bd61d582432db874d41c7ca.

- - - - -
7ead35d8 by Steve Lhomme at 2024-08-01T08:28:04+00:00
contrib: remove cross-compiled path from Meson PATH

It was originally kept in ccee6f6488f75013cb54b84e13082f32fd1320bc.
But we should not use binaries from there as most of the time they
can't run locally.

native tools we may use are in BUILDPREFIX/bin (or BUILDBINDIR) which
is always in the path.

- - - - -
42b66287 by Steve Lhomme at 2024-08-01T08:28:04+00:00
contrib: remove unneeded ELF binary removal from prebuilt for native win32

This should never happen. Only the HOST folder is kept in the archive.
And it can only contain win32/win64 binaries.

See the "package" target.

- - - - -
1bab3647 by Steve Lhomme at 2024-08-01T08:28:04+00:00
contrib: wix: don't pretend they are native tools

prebuilt contains the cross-compiled tools.

- - - - -


4 changed files:

- contrib/src/gcrypt/rules.mak
- contrib/src/main.mak
- contrib/src/wix/rules.mak
- contrib/src/wixlzx/rules.mak


Changes:

=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -38,6 +38,10 @@ GCRYPT_CONF = \
 	--enable-pubkey-ciphers=dsa,rsa,ecc \
 	--disable-doc
 
+ifneq ($(call need_pkg,"gpg-error >= 1.27"),)
+GCRYPT_CONF += --with-libgpg-error-prefix=$(PREFIX)
+endif
+
 ifdef HAVE_WIN32
 ifeq ($(ARCH),x86_64)
 GCRYPT_CONF += --disable-asm --disable-padlock-support


=====================================
contrib/src/main.mak
=====================================
@@ -345,7 +345,6 @@ endif
 HOSTTOOLS := \
 	CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" LD="$(LD)" \
 	AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
-	PATH="$(PREFIX)/bin:$(PATH)" \
 	PKG_CONFIG="$(PKG_CONFIG)"
 
 HOSTVARS_MESON := $(HOSTTOOLS)
@@ -544,7 +543,7 @@ ifdef HAVE_CROSS_COMPILE
 # generated crossfile, so everything should work as
 # expected.
 MESONFLAGS += --cross-file $(abspath crossfile.meson)
-MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
+MESON = env -i PATH="$(PATH)" \
 	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
 	CMAKE="$(shell command -v cmake)" \
 	CMAKE_PREFIX_PATH="$(PREFIX)" \
@@ -672,11 +671,6 @@ prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
 	$(UNPACK)
 	mv $(HOST) $(PREFIX)
 	cd $(PREFIX) && $(abspath $(SRC))/change_prefix.sh
-ifdef HAVE_WIN32
-ifndef HAVE_CROSS_COMPILE
-	$(RM) `find $(PREFIX)/bin | file -f- | grep ELF | awk -F: '{print $$1}' | xargs`
-endif
-endif
 
 package: install
 	rm -Rf tmp/


=====================================
contrib/src/wix/rules.mak
=====================================
@@ -6,8 +6,6 @@ WIX_URL := $(GITHUB)/wixtoolset/wix3/releases/download/wix$(WIX_VERSION)$(WIX_SU
 ifdef HAVE_WIN32
 # this requires dotnet 4.0 to be installed when running wix
 PKGS += wix
-# need to be installed when using prebuilt
-PKGS_TOOLS += wix
 endif
 
 .sum-wix: wix$(WIX_FULL_VERSION).zip


=====================================
contrib/src/wixlzx/rules.mak
=====================================
@@ -29,8 +29,6 @@ WIX_LZX_URL := $(CONTRIB_VIDEOLAN)/wixlzx/wix3.5.2519.0.zip
 ifdef HAVE_WIN32
 # this requires dotnet 4.0 to be installed when running wix
 PKGS += wixlzx
-# need to be installed when using prebuilt
-PKGS_TOOLS += wixlzx
 endif
 
 DEPS_wixlzx = wix $(DEPS_wix)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0119f8141b8ef38822540313d77594baf6a78e07...1bab36476f3f549111381f6de2214fb5b51c443b

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


VideoLAN code repository instance