[vlc-commits] contrib: fixed shasum execution, which uses a slightly different syntax than sha512sum

Felix Paul Kühne git at videolan.org
Wed Jul 6 19:33:50 CEST 2011


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Jul  6 19:33:45 2011 +0200| [adeed33e7b26bb9ad7d0634d192c285ccd4f4635] | committer: Felix Paul Kühne

contrib: fixed shasum execution, which uses a slightly different syntax than sha512sum

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=adeed33e7b26bb9ad7d0634d192c285ccd4f4635
---

 contrib/src/main.mak |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 140b0f3..03a3fe9 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -137,9 +137,9 @@ download = $(error Neither curl nor wget found!)
 endif
 
 ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = sha512sum
+SHA512SUM = sha512sum --check - <
 else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = shasum -a 512
+SHA512SUM = shasum -a 512 --check
 else
 SHA512SUM = $(error SHA-512 checksumming not found!)
 endif
@@ -177,8 +177,8 @@ download_git = \
 	(cd $(dir $@) && \
 	 tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
 	rm -Rf $(@:.tar.xz=)
-checksum = (cd $(TARBALLS) && $(1) --check -) < \
-		$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS
+checksum = (cd $(TARBALLS) && $(1) \
+		$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS )
 CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512)
 UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \



More information about the vlc-commits mailing list