Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
0a555fa1 by Steve Lhomme at 2022-11-09T12:07:13+00:00
contrib: don't show untar'ed files in non verbose mode
This avoids being bombarded with logs when building.
- - - - -
4 changed files:
- contrib/src/lua/rules.mak
- contrib/src/main-rust.mak
- contrib/src/main.mak
- contrib/src/protobuf/rules.mak
Changes:
=====================================
contrib/src/lua/rules.mak
=====================================
@@ -125,7 +125,7 @@ endif
luac: UNPACK_DIR=luac-$(LUA_VERSION)
luac: lua-$(LUA_VERSION).tar.gz .sum-luac
$(RM) -Rf $@ $(UNPACK_DIR) && mkdir -p $(UNPACK_DIR)
- tar xvzfo $< -C $(UNPACK_DIR) --strip-components=1
+ tar $(TAR_VERBOSE)xzfo $< -C $(UNPACK_DIR) --strip-components=1
$(APPLY) $(SRC)/lua/Enforce-always-using-64bit-integers-floats.patch
$(MOVE)
=====================================
contrib/src/main-rust.mak
=====================================
@@ -82,7 +82,7 @@ download_vendor = \
.%-vendor: $(SRC)/%-vendor/SHA512SUMS
$(RM) -R $(patsubst .%,%,$@)
-$(call checksum,$(SHA512SUM),SHA512,.) \
- $(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f) && \
+ $(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo
$(f) && \
mv $(patsubst %.tar.bz2,%,$(notdir $(f))) $(patsubst .%,%,$@))
touch $@
=====================================
contrib/src/main.mak
=====================================
@@ -404,6 +404,10 @@ check_githash = \
< "$(<:.tar.xz=.githash)"` && \
test "$$h" = "$1"
+ifeq ($(V),1)
+TAR_VERBOSE := v
+endif
+
checksum = \
$(foreach f,$(filter $(TARBALLS)/%,$^), \
grep -- " $(f:$(TARBALLS)/%=%)$$" \
@@ -412,9 +416,9 @@ checksum = \
"$(SRC)/$(patsubst $(3)%,%,$@)/$(2)SUMS"
CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512,.sum-)
UNPACK = $(RM) -R $@ \
- $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzfo $(f)) \
- $(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f)) \
- $(foreach f,$(filter %.tar.xz,$^), && tar xvJfo $(f)) \
+ $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo
$(f)) \
+ $(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \
+ $(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \
$(foreach f,$(filter %.zip,$^), && unzip $(f))
UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -44,7 +44,7 @@ PROTOCCONF += --enable-static --disable-shared
protoc: protoc-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protoc
$(RM) -Rf $@ $(UNPACK_DIR) && mkdir -p $(UNPACK_DIR)
- tar xvzfo "$<" -C $(UNPACK_DIR) --strip-components=1
+ tar $(TAR_VERBOSE)xzfo "$<" -C $(UNPACK_DIR) --strip-components=1
# don't build benchmarks and conformance
sed -i.orig 's, conformance benchmarks,,' "$(UNPACK_DIR)/Makefile.am"
sed -i.orig 's, benchmarks/Makefile conformance/Makefile,,'
"$(UNPACK_DIR)/configure.ac"
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0a555fa1ac6db47923c9db03faa8d49393f571ec
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0a555fa1ac6db47923c9db03faa8d49393f571ec
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
