[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: remove UNPACK_DIR when unpacking

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
ebbaf021 by Steve Lhomme at 2026-07-18T06:53:30+00:00
contrib: remove UNPACK_DIR when unpacking

We remove the target folder but if a previous build was interrupted, the
unpack directory may be there and fail to unpack.

- - - - -
d49beee2 by Steve Lhomme at 2026-07-18T06:53:30+00:00
extras/tools: remove UNPACK_DIR when unpacking

We remove the target folder but if a previous build was interrupted, the
unpack directory may be there and fail to unpack.

- - - - -


2 changed files:

- contrib/src/main.mak
- extras/tools/tools.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -468,7 +468,7 @@ checksum = \
 	(cd $(TARBALLS) && $(1) /dev/stdin) < \
 		"$(SRC)/$(patsubst $(3)%,%,$@)/$(2)SUMS"
 CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512,.sum-)
-UNPACK = $(RM) -R $@ \
+UNPACK = $(RM) -R $@ $(UNPACK_DIR) \
 	$(foreach f,$(filter %.tar.gz %.tgz %.tar.bz2 %.tar.xz %.tar.zst,$^), && tar $(TAR_VERBOSE)xfo $(f)) \
 	$(foreach f,$(filter %.zip,$^), && unzip $(ZIP_QUIET) $(f) $(UNZIP_PARAMS))
 UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))


=====================================
extras/tools/tools.mak
=====================================
@@ -43,7 +43,7 @@ ifeq ($(V),1)
 TAR_VERBOSE := v
 endif
 
-UNPACK = $(RM) -R $@ \
+UNPACK = $(RM) -R $@ $(UNPACK_DIR) \
     $(foreach f,$(filter %.tar.gz %.tgz %.tar.bz2 %.tar.xz %.tar.zst,$^), && tar $(TAR_VERBOSE)xfo $(f)) \
     $(foreach f,$(filter %.zip,$^), && unzip $(f))
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9ea51b7ea89b825161772212a7cadb98be4cecde...d49beee21df87c2f30cda8aed7b993f355579d3a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9ea51b7ea89b825161772212a7cadb98be4cecde...d49beee21df87c2f30cda8aed7b993f355579d3a
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help