[deps] Correctly "pack" the unwind and llvmunwind checksums into …

…the correct files

Modifies the refresh-checksums files to ensure these are in the correct
files, without raciness.

contrib/refresh_checksums.mk

@@ -96,39 +96,39 @@ checksum-doc-unicodedata:
 all: checksum-doc-unicodedata
 .PHONY: checksum-doc-unicodedata
 
-# Special LLVM source hashes for optional targets
-checksum-llvm-special-src:
-	-+$(MAKE) $(QUIET_MAKE) -C "$(JULIAHOME)/deps" USE_BINARYBUILDER_LLVM=0 DEPS_GIT=0 checksum-llvm
-all: checksum-llvm-special-src
-.PHONY: checksum-llvm-special-src
-
 # merge substring project names to avoid races
 pack-checksum-llvm-tools: | pack-checksum-llvm
+	@# nothing to do but disable the prefix rule
 pack-checksum-llvm: | checksum-llvm-tools
 pack-checksum-csl: | pack-checksum-compilersupportlibraries
+	@# nothing to do but disable the prefix rule
 pack-checksum-compilersupportlibraries: | checksum-csl
-
-# We need to adjust to the fact that the checksum files are called `suitesparse`
 pack-checksum-libsuitesparse: | pack-checksum-suitesparse
 	@# nothing to do but disable the prefix rule
 pack-checksum-suitesparse: | checksum-libsuitesparse
+# This is a bit tricky: we want llvmunwind to be separate from unwind and llvm,
+# so we add a rule to process those first
+pack-checksum-llvm pack-checksum-unwind: | pack-checksum-llvmunwind
+# and the name for LLVMLibUnwind is awkward, so handle that with a regex
+pack-checksum-llvmunwind: | pack-checksum-llvm.*unwind
+	@# nothing to do but disable the prefix rule
 
 # define how to pack parallel checksums into a single file format
 pack-checksum-%: FORCE
-	@echo making "$(JULIAHOME)/deps/checksums/$*"
+	@echo making "$(JULIAHOME)/deps/checksums/"'$*'
 	@cd "$(JULIAHOME)/deps/checksums" && \
 		for each in $$(ls | grep -i '$*'); do \
-			if [ -d $$each ]; then \
-				for type in $$(ls $$each); do \
-					echo $$each/$$type/$$(cat $$each/$$type); \
-					rm $$each/$$type; \
+			if [ -d "$$each" ]; then \
+				for type in $$(ls "$$each"); do \
+					echo "$$each"/"$$type"/$$(cat "$$each"/"$$type"); \
+					rm "$$each"/"$$type"; \
 				done; \
-				rmdir $$each; \
+				rmdir "$$each"; \
 			fi; \
-		done >> $*
+		done > '$*'
 	@cd "$(JULIAHOME)/deps/checksums" && \
-		sort $* > $*.tmp && \
-		mv $*.tmp $*
+		sort '$*' > '$*.tmp' && \
+		mv '$*.tmp' '$*'
 
 # This file is completely phony
 FORCE:

deps/checksums/llvmunwind → deps/checksums/llvm.*unwind

@@ -1,7 +1,3 @@
-llvmunwind-12.0.1.tar.xz/md5/4ec327cee517fdb1f6a20e83748e2c7b
-llvmunwind-12.0.1.tar.xz/sha512/847b6ba03010a43f4fdbfdc49bf16d18fd18474d01584712e651b11191814bf7c1cf53475021d9ee447ed78413202b4ed97973d7bdd851d3e49f8d06f55a7af4
-LLVMLibUnwind.v12.0.1+0.aarch64-apple-darwin.tar.gz/md5/b95ad4844e649bf46db43683b55b9f4f
-LLVMLibUnwind.v12.0.1+0.aarch64-apple-darwin.tar.gz/sha256/
 LLVMLibUnwind.v12.0.1+0.aarch64-apple-darwin.tar.gz/md5/b95ad4844e649bf46db43683b55b9f4f
 LLVMLibUnwind.v12.0.1+0.aarch64-apple-darwin.tar.gz/sha512/15e0996aebe6db91fe58121001aa7ea4b23685ead3c26b5d89afae34b535e34b4e801a971f4854d8e1a1fbc805cece06272470622eef863e225358113a127913
 LLVMLibUnwind.v12.0.1+0.aarch64-linux-gnu.tar.gz/md5/6d8783dc9b86c9884e0877f0d8ac4167
@@ -34,3 +30,5 @@ LLVMLibUnwind.v12.0.1+0.x86_64-unknown-freebsd.tar.gz/md5/54ac594b4c8e7f261034a8
 LLVMLibUnwind.v12.0.1+0.x86_64-unknown-freebsd.tar.gz/sha512/a43756afd92081e6dd7244d162862fc318b41ca110a5e8be6e4ee2d8fdfd8fb0f79961ae55e48913e055779791bd1c0ecd34fd59281fb66b3c4f24a1f44128f0
 LLVMLibUnwind.v12.0.1+0.x86_64-w64-mingw32.tar.gz/md5/83cf8fc2a085a73b8af4245a82b7d32f
 LLVMLibUnwind.v12.0.1+0.x86_64-w64-mingw32.tar.gz/sha512/297a5c7b33bd3f57878871eccb3b9879ea5549639523a1b9db356b710cafb232906a74d668315340d60ba0c5087d3400f14ab92c3704e32e062e6b546abf7df6
+llvmunwind-12.0.1.tar.xz/md5/4ec327cee517fdb1f6a20e83748e2c7b
+llvmunwind-12.0.1.tar.xz/sha512/847b6ba03010a43f4fdbfdc49bf16d18fd18474d01584712e651b11191814bf7c1cf53475021d9ee447ed78413202b4ed97973d7bdd851d3e49f8d06f55a7af4

deps/checksums/unwind

@@ -22,35 +22,5 @@ LibUnwind.v1.3.2+4.x86_64-linux-musl.tar.gz/md5/bd8ea5006d6078a1d91743f599f37732
 LibUnwind.v1.3.2+4.x86_64-linux-musl.tar.gz/sha512/1c7feea46d70c60dbecfe6b945a29a086dc120e0d674ea9d488dc7943901711ba0505288694c94a2b0804bab6cd826b32e58912e407ed918724d16b6b6ec1d3d
 LibUnwind.v1.3.2+4.x86_64-unknown-freebsd.tar.gz/md5/e72c36f0563a088282147275de90048b
 LibUnwind.v1.3.2+4.x86_64-unknown-freebsd.tar.gz/sha512/3aaa7e5c21b3bcc30ff7826af4bc0b926865cac3a5b14dfa7f27f0c5d4344fa2a568a78c0c4ee32a18e668758cdac70c09f31f5ca55cc56c3d6a88654aa906fa
-LLVMLibUnwind.v11.0.1+1.aarch64-apple-darwin.tar.gz/md5/aceea9c7eca53a8da86c6d0b713a8c99
-LLVMLibUnwind.v11.0.1+1.aarch64-apple-darwin.tar.gz/sha512/621b6c23b852332039bcd856ff330cc6109f5f18e646a7863900dd5ae9115a1f8a2f5da3fd50de2589da1af5e2326634259dec505972e2033f0772b7c38c5944
-LLVMLibUnwind.v11.0.1+1.aarch64-linux-gnu.tar.gz/md5/53999245ae1b82eb15baa9aaad078365
-LLVMLibUnwind.v11.0.1+1.aarch64-linux-gnu.tar.gz/sha512/a6a49da09b476eb87fab7e472a45d8417a701693ea928aa1c753722e430eb17a4b4ce3b8711de0238705eac3436391b806b8eff9b0ee922db095ed4a87ded67e
-LLVMLibUnwind.v11.0.1+1.aarch64-linux-musl.tar.gz/md5/d900059ad3eb62827b1efc19343fe288
-LLVMLibUnwind.v11.0.1+1.aarch64-linux-musl.tar.gz/sha512/14cc60ff4ddfe4ed8568457069614d463d9d8ecd89633c05986da97374a6c1317c363c80654fe61731b574638e1ee62d38c399c850ffa4c0245d5046cc091b75
-LLVMLibUnwind.v11.0.1+1.armv6l-linux-gnueabihf.tar.gz/md5/5c1f9945de5d3537aff8623551eeb92e
-LLVMLibUnwind.v11.0.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/a9d1b6973f2cd681572d86ef5c0d26fce3c7a8eb3a40e3c0344c3356da71d0b9feb05ae33cfc9d28c722054925eb8b7918eaf9edb47536b55497815002852cb1
-LLVMLibUnwind.v11.0.1+1.armv6l-linux-musleabihf.tar.gz/md5/77292837c1947f211a161e26ffddb71d
-LLVMLibUnwind.v11.0.1+1.armv6l-linux-musleabihf.tar.gz/sha512/522a2942796c165e9c060dca9507ec86adb3110b524b856c5e5f364a0540b9f3842fb5d9c8ffdb1af06bdd6d6b1d4de6ae45d9fa274b1e45af0ce7e84785f9ee
-LLVMLibUnwind.v11.0.1+1.armv7l-linux-gnueabihf.tar.gz/md5/4e40751ed7a622970c81c29a28280341
-LLVMLibUnwind.v11.0.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/11c33018723fe2f96e61a7e6126ccef09cfc8504d93e01c8ab4b74acd71230bec2d5be4a3bd65a582cdd582ef81a00095668ab0068c4084ceed6ee8653472090
-LLVMLibUnwind.v11.0.1+1.armv7l-linux-musleabihf.tar.gz/md5/c5d5b263a9291433c222d5812d8ee232
-LLVMLibUnwind.v11.0.1+1.armv7l-linux-musleabihf.tar.gz/sha512/b9e3abea035aafd4cebc00d63d30a15aedd702125d1b1e8988f3563d5adf495fcce86200fad95ab1db0721a533dc0af7c61fd678f17203d629525bc283f74632
-LLVMLibUnwind.v11.0.1+1.i686-linux-gnu.tar.gz/md5/bd3186039f77f656838c73cf6ebcb0ff
-LLVMLibUnwind.v11.0.1+1.i686-linux-gnu.tar.gz/sha512/01b4a99d25a69b367b540b363bcc71fa10d6cd34e53ceeeba7f81f372873bb1cf3bde66fa280bbb60b65b679639479f46acd76823d79418c641d3354cc1e0c01
-LLVMLibUnwind.v11.0.1+1.i686-linux-musl.tar.gz/md5/58bec4c7eef0b79d3878b465f3f52d6d
-LLVMLibUnwind.v11.0.1+1.i686-linux-musl.tar.gz/sha512/b5467a4f25abbc6097d83f414ace31ac58429ce4ee5d8ca7cc0a77612a237e3e8050578b2c90bc8f30e7c346c3eb64a939c854614e1d51dad0133d52905dbce8
-LLVMLibUnwind.v11.0.1+1.i686-w64-mingw32.tar.gz/md5/40ead04fdf8afc1cd96fe6da98bb7095
-LLVMLibUnwind.v11.0.1+1.i686-w64-mingw32.tar.gz/sha512/269fe9159714819dae63afa1fca28fea885eb4d855715c5c38e7ab63f9ff87b7a5c717228b73c8957404a025a8439e711edb15e1df5c70180dc642fbdeab8264
-LLVMLibUnwind.v11.0.1+1.powerpc64le-linux-gnu.tar.gz/md5/cf1fcc8d88040c7c55ff198201b9b22f
-LLVMLibUnwind.v11.0.1+1.powerpc64le-linux-gnu.tar.gz/sha512/ec417cf4d55f471bea1ed3adfe0ce2686f61f34011c6006289bcad923ba1a53d98271decf43fcbaf6fecb0cffe7c8d771200d6fd4783fc26894044da69c3a04d
-LLVMLibUnwind.v11.0.1+1.x86_64-apple-darwin.tar.gz/md5/0bca573e5476ae37191d8ae3a75721de
-LLVMLibUnwind.v11.0.1+1.x86_64-apple-darwin.tar.gz/sha512/90287c998f0d141703a2388d2ff2a496d4f7b57cb89b658f26ea0447edcc095a6342dd4a02d152638c4466dadf2527ad374e3f5ef905cc7ced7c16b5b1ea4d54
-LLVMLibUnwind.v11.0.1+1.x86_64-linux-gnu.tar.gz/md5/88d17930d6e1b95da3d9a0f07a43fa49
-LLVMLibUnwind.v11.0.1+1.x86_64-linux-gnu.tar.gz/sha512/c6969c1380ca02be47010ef3882cde815e27a4e23bdbefcb94aa1af76889519ff8e43d83d3156df21be5c909ab5ca7a2199ec742f9711f11d49a743c8a5cac10
-LLVMLibUnwind.v11.0.1+1.x86_64-linux-musl.tar.gz/md5/6033356ddd94624e785d3820ab091eab
-LLVMLibUnwind.v11.0.1+1.x86_64-linux-musl.tar.gz/sha512/da7d45efb4b53033031b4656a8877250520b905c4103d0e49079f1c0d80360f258694515bbeb8f687bbe0cf931e357855dea0602b7ef5b50b25f7ccd4ea92829
-LLVMLibUnwind.v11.0.1+1.x86_64-unknown-freebsd.tar.gz/md5/bed33a2f926ae888a97f87e68919eb95
-LLVMLibUnwind.v11.0.1+1.x86_64-unknown-freebsd.tar.gz/sha512/a043e01e2e18c4c7b907cc37a7af2231ca3895edaf69ba0df62f5d615e594d2d75193c03d902beb4c39a06cbcb9f394959de527ce7144374b22371f4c47b9b43
-LLVMLibUnwind.v11.0.1+1.x86_64-w64-mingw32.tar.gz/md5/c9f98a3a63137d4a5ad3c81f24d8e3cb
-LLVMLibUnwind.v11.0.1+1.x86_64-w64-mingw32.tar.gz/sha512/4b27d33dc31511e3a7913f360dee4e0ff7f3bf9f6256f4e71473e3b3fafbedf27fbe87d6a96ed4bba57be8c2150f9e42ee2627a48c6d3d87e466c274cd5949cb
+libunwind-1.3.2.tar.gz/md5/52a8be39f0d6fd4efb7409973e425fa8
+libunwind-1.3.2.tar.gz/sha512/221864eae6bf0fde281d9551662af1e539ce919fbb7050947e60dbcc09efed4f5d34574dbce11792513e63151e0af72f02801b7bcd37a6a519e6d868abb8b509