Skip to content

Commit 8d74078

Browse files
nhz2KristofferC
nhz2
authored and
KristofferC
committed
p7zip 17.7.0 (#60025)
(cherry picked from commit 32ac2ec)
1 parent afcf015 commit 8d74078

File tree

5 files changed

+53
-61
lines changed

5 files changed

+53
-61
lines changed

‎deps/checksums/p7zip‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
p7zip-17.06.tar.gz/md5/d1c764d2b0ad18ec9fc2a4ac9693b110
2-
p7zip-17.06.tar.gz/sha512/5d6fa691da7fcbeabfe5610aa29b613daac1470002c3d84201f3ad63bcf79f2c72e21fa45f6ba19abbb41cf404f2d659990b9f9fd29b84ac511c8a17f09fec68
3-
p7zip.v17.6.0+0.aarch64-apple-darwin.tar.gz/md5/93c592e6122e692020bd36e6128bf45b
4-
p7zip.v17.6.0+0.aarch64-apple-darwin.tar.gz/sha512/431e266b17f09e221e557ccb65e1d45b27db06ef893127568d688f59d3825f2d72a2a801b84b1e56cfd7f8dec99c7871a722bf003a173b7ca605a4142da246b7
5-
p7zip.v17.6.0+0.aarch64-linux-gnu.tar.gz/md5/4da3b34dae5342bc1fcd207922866c67
6-
p7zip.v17.6.0+0.aarch64-linux-gnu.tar.gz/sha512/caa03f6aa583f8310504dd6f7b3b37415f2cf60752deb18401bfed0e7dcb17319df99070f7fbafc5b25304d2a230a85c962653ccbddd7438d36f67de42e736a6
7-
p7zip.v17.6.0+0.aarch64-linux-musl.tar.gz/md5/6989fee23b56d19476de4a86c77c4693
8-
p7zip.v17.6.0+0.aarch64-linux-musl.tar.gz/sha512/75413c042eb39fb4ccc52aecc1db56567ab07a32a689631b2e84f68edc63fb3ab85409fb2a07d46613c6ed8368a647a2df12b26b0f509d09ac45d1d15cc0d90d
9-
p7zip.v17.6.0+0.aarch64-unknown-freebsd.tar.gz/md5/5b7b260bfb133cf9d5db9d7f1a4cdef6
10-
p7zip.v17.6.0+0.aarch64-unknown-freebsd.tar.gz/sha512/4457b30e77fe786e061d94104cd3b96744dadbc37c4a7d8cc6af5d8e3a140f2c47d84ad8689cd67a46997fcefe97c4045cbd8c29841a1f8cea66989aca117675
11-
p7zip.v17.6.0+0.armv6l-linux-gnueabihf.tar.gz/md5/e2b57b61cb5b5b345e67d658436cc82d
12-
p7zip.v17.6.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/939a498219cfae5084311553649ec8e919419f8e5cd35b7eaaf3c10a8e6d5180a47078a80ab745601004da2dc511f0d5f6c4b2f88a45b260f44723c2f44a87a2
13-
p7zip.v17.6.0+0.armv6l-linux-musleabihf.tar.gz/md5/8f5d3d461ca131a58137b4fef3e8bad1
14-
p7zip.v17.6.0+0.armv6l-linux-musleabihf.tar.gz/sha512/7a44732992b2bd1d8c862d16b2c488cfbd7e095eaabfff462ef18bf89693e2607267332ec37856394b6997227c9171948ad8450312688a652238a6c69402a536
15-
p7zip.v17.6.0+0.armv7l-linux-gnueabihf.tar.gz/md5/ce904ca43c2614576432da22a49f4403
16-
p7zip.v17.6.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/5ee4bcc87987d56d22086951ac9b0847e46c576d56b46d8d9394571512ce377b6ae4e74d41d75b40101543aff059135772c3ac2d62d2e3f27242568b08a27573
17-
p7zip.v17.6.0+0.armv7l-linux-musleabihf.tar.gz/md5/e120a903bfb8beab2264656f175fbb14
18-
p7zip.v17.6.0+0.armv7l-linux-musleabihf.tar.gz/sha512/2d7ea15f258c6eb1153d91a941d1a9518991f53d5b4f3024a4d4d962a980957ea1996cb9a5e7602476f46736ea6c78ebd1a9dceeb05d4bf4103080b58be0e641
19-
p7zip.v17.6.0+0.i686-linux-gnu.tar.gz/md5/1b4df70626fe5bc3958a0639c91154aa
20-
p7zip.v17.6.0+0.i686-linux-gnu.tar.gz/sha512/13f428a543b025a639a50da77c4d2cd98972212b9aeaa397572ee87fcce98aeaf6a38300e6aec3e4aafe184f2ba114262de291ee3f6fdc0ff891050edeb47927
21-
p7zip.v17.6.0+0.i686-linux-musl.tar.gz/md5/61b2a40251b360997f9475dfccede380
22-
p7zip.v17.6.0+0.i686-linux-musl.tar.gz/sha512/e9db0f2f874a30c2041577c0c2b220b9b4391517fad68c4d474666c8fe4f62f0799203eb1f21ade3f1cbeed1efcc2de929d18e6b48ca21c8bc3429868830ad64
23-
p7zip.v17.6.0+0.i686-w64-mingw32.tar.gz/md5/8aa4ea90bc28bbaa4f480dac0c64a4ab
24-
p7zip.v17.6.0+0.i686-w64-mingw32.tar.gz/sha512/796152faeeaa8a1eec913597fdc52d18f3af1c777fcb4e38d24ca074cf1e5269a51d30b5ae240b28b836c2fda8696f93b1102f0b6b97401abc2200cb7583e96a
25-
p7zip.v17.6.0+0.powerpc64le-linux-gnu.tar.gz/md5/494fd9dbb269d905dfb857d400bb4724
26-
p7zip.v17.6.0+0.powerpc64le-linux-gnu.tar.gz/sha512/1e1582795d2d75c79e33463754dc4a2fc1393099205f91b02836198bbdb8ecaf2843a40a16acf415c79b6d54bb4ca375235aba6b8e5ea98ac368874cf52f707a
27-
p7zip.v17.6.0+0.riscv64-linux-gnu.tar.gz/md5/26301bd63d43cec892a6638a136e3a12
28-
p7zip.v17.6.0+0.riscv64-linux-gnu.tar.gz/sha512/4f4163ed73b4c4d79f0d7531a6fd9262e7291344a10b9f225ece00418be3d45b858852233c3ebd93e20906dd0e0eca56ddb657276a793b9626a5d86debe9c38f
29-
p7zip.v17.6.0+0.x86_64-apple-darwin.tar.gz/md5/360e51654cb9c10d1714b93937e6ccd2
30-
p7zip.v17.6.0+0.x86_64-apple-darwin.tar.gz/sha512/1126f1ac3386f2af6b5889e18949765b791d197fc86a301d725a4140bcd1731b2b4f9bce9ffb2c18e04738ee4d9594064b9d6d64915fc1583264ab338397bec5
31-
p7zip.v17.6.0+0.x86_64-linux-gnu.tar.gz/md5/6eadadce703dd8188c8e78373a8b0c89
32-
p7zip.v17.6.0+0.x86_64-linux-gnu.tar.gz/sha512/95c1c20f4de9815af9d616284c755cb2f82d56dfa1d1d8f37d95d3d3ba0b1a1dd61ad58c218764532d92fe0a1b48f7e64c19e5fcb048da4f30489538504f897c
33-
p7zip.v17.6.0+0.x86_64-linux-musl.tar.gz/md5/5096d4e5d2ea3b9cf842531db4be9e9c
34-
p7zip.v17.6.0+0.x86_64-linux-musl.tar.gz/sha512/a28eaa2199f30e6870026e5e211cf3c5b458ea37fa01ab11b042a57561c7eb7133370450fccedab0f4a618986e1ccde6de420d6d1e155f942175aba6c8088ce4
35-
p7zip.v17.6.0+0.x86_64-unknown-freebsd.tar.gz/md5/0442f6ed073c89f99acbab3fcbf1f97c
36-
p7zip.v17.6.0+0.x86_64-unknown-freebsd.tar.gz/sha512/a634ab27cd580cc158285b108f3b321a8dbe5865334e4b09fb6528fe12ad1d35d51fb4d9c85b75ba140fc5c9782c1a203857cce57de9da2567f1cb4f6264a7e8
37-
p7zip.v17.6.0+0.x86_64-w64-mingw32.tar.gz/md5/9eeab70f56b060d749f24e0faedfc12f
38-
p7zip.v17.6.0+0.x86_64-w64-mingw32.tar.gz/sha512/fa024300b9bd6bf147f4d7200a28b72a0690159b33567b5de23ac32c5572b7c423618adcc1a4463639283fab7a643c4e70f84343572907220cd8b4a1014f1cef
1+
7z2501-src.tar.xz/md5/00904e3039346ee32b7a500a34e2d699
2+
7z2501-src.tar.xz/sha512/5ee146ce993c6d12ad19333dc3545e6c3429212260c22d456390e49ca150e6fcbfc6eae45b5ec61138ae1598d7b4a79d6f2e3ff02929af38039c0ca59823e729
3+
p7zip.v17.7.0+0.aarch64-apple-darwin.tar.gz/md5/a52be1050f7903c9664379eede9ec6f0
4+
p7zip.v17.7.0+0.aarch64-apple-darwin.tar.gz/sha512/b8816a06bf964e55aaca09871ba59434e6c936d8449783bee7be8ba534d5eff9908a889e7b18f5a5cc1c51b291e3d6d107060cc1e83aced3cbc452e089f4cc0e
5+
p7zip.v17.7.0+0.aarch64-linux-gnu.tar.gz/md5/4e14f09c1a57ad742c69e95b3df3a76e
6+
p7zip.v17.7.0+0.aarch64-linux-gnu.tar.gz/sha512/79ca72ef17e50016b15d8bba9aaa49e1e174b6496470344e42658d861d4fd4a6337660a3b4b08c351f21f4d23ea96a0b1ba01d2f7b1724765c62be282d3c577b
7+
p7zip.v17.7.0+0.aarch64-linux-musl.tar.gz/md5/07936d59f9cf3161ac8daf6427929a83
8+
p7zip.v17.7.0+0.aarch64-linux-musl.tar.gz/sha512/807dc652ea62823188774e16c6b93fceb904042e3d22cb4eaf82dc393966b458d0d9bca578da7087466e63007a918c5caf24f19b03b8720fc5b4c9cfedbdbcce
9+
p7zip.v17.7.0+0.aarch64-unknown-freebsd.tar.gz/md5/6cd8a5e16ed17b56d8eadf1e7e167512
10+
p7zip.v17.7.0+0.aarch64-unknown-freebsd.tar.gz/sha512/1904bae2b48e27a02c3fda3324c5ebe2fb736984659bbfac4cb5071fb31130062e574eb2ac5fb8002d8c6f56ce89d47f74ac37343eee07822ad634db477582bb
11+
p7zip.v17.7.0+0.armv6l-linux-gnueabihf.tar.gz/md5/32dff6435c64a22fb5a504d5c1429c49
12+
p7zip.v17.7.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/7bfee156ce16106f8ea50d4de63de7536030f560110aad9e8390a549443d311b4373c1940df680876b5b44a2f728981268c5d21bc083aa97820e79f362eecc21
13+
p7zip.v17.7.0+0.armv6l-linux-musleabihf.tar.gz/md5/cc7671317b0f450cb6584927ac31129e
14+
p7zip.v17.7.0+0.armv6l-linux-musleabihf.tar.gz/sha512/76680da33289cf227686dbefae41401abd46826089d5880bad47e661c35f5d0ae2bbed4dadff60682651b3cc0ae7bcd0fd95d1c838197cf72a24c815be4c9895
15+
p7zip.v17.7.0+0.armv7l-linux-gnueabihf.tar.gz/md5/c7ef8bc1143cd7b7e8cabd150cb03015
16+
p7zip.v17.7.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/08d5934d1fa7795e7c956b3ac519bebe52cfebd7f546d60f03800265cec560dd004c12523e43d3fa9086f73276450dfd76c67bf6522c55c4fba81c8172944fb2
17+
p7zip.v17.7.0+0.armv7l-linux-musleabihf.tar.gz/md5/87067e9348d302e58740dd71b6dff9e7
18+
p7zip.v17.7.0+0.armv7l-linux-musleabihf.tar.gz/sha512/f04be74daf9ffc29ef0c33ef367e1136828f3e4dc027995eabb9e757e754bc9c34fd19089e5d8e5b6a4c4ec8e43237aedaee4b99f04c1d7631961e0d0aa3345f
19+
p7zip.v17.7.0+0.i686-linux-gnu.tar.gz/md5/ff1aad93d8dae893f1dc23e856ed05ac
20+
p7zip.v17.7.0+0.i686-linux-gnu.tar.gz/sha512/06475f5d401839e438db068b48a6a34ddf4b72ee3010589d4c3a9ae6f2afe18a7b2af34437c60c6b9e0d8f657a6df2d740f1e39885bd78bb0eddf02ce020a2b6
21+
p7zip.v17.7.0+0.i686-linux-musl.tar.gz/md5/a843068034a5410022afc6aa36bab84c
22+
p7zip.v17.7.0+0.i686-linux-musl.tar.gz/sha512/15a32626ac48fb043c33f564dd36550913be19f0193fa2e52e95b81e2e4d087a84e1c05d42381ed57b3ac0d38695d50cf6d146f462460661b2a6a3abc9a6b578
23+
p7zip.v17.7.0+0.i686-w64-mingw32.tar.gz/md5/c7c4af99790b838f611c252b2268e83a
24+
p7zip.v17.7.0+0.i686-w64-mingw32.tar.gz/sha512/a5d44bf97fbd9381d71bbc0472348221bcf77bc0813af5fb0c56d40a1774ee430865402481dba005166689e7c9670ff82deb4616d9d32ece226decc89be7ed19
25+
p7zip.v17.7.0+0.powerpc64le-linux-gnu.tar.gz/md5/dab2a1fcff915cce8e81740614e400c4
26+
p7zip.v17.7.0+0.powerpc64le-linux-gnu.tar.gz/sha512/ca71a8a2def311a21db5018f21613c1354704b0a03c92fea5f8ed38b9e6be776509bd138fdbc222e6c560928f4ad381e98c86e952a1707dd459705c5676f5754
27+
p7zip.v17.7.0+0.riscv64-linux-gnu.tar.gz/md5/cb86be2084d96777b3cb2b097a1cbd47
28+
p7zip.v17.7.0+0.riscv64-linux-gnu.tar.gz/sha512/537ac28020f88bc6fbf9cdd2b2cffe9879c9f0d74aa02567181b47a2a63c622bd5d2c9de67b7dc74cfc8e372d672b8269f965c6ee098a03a0b89ae0ed53bbf9c
29+
p7zip.v17.7.0+0.x86_64-apple-darwin.tar.gz/md5/c9f06846dec4e868b669ada25409d031
30+
p7zip.v17.7.0+0.x86_64-apple-darwin.tar.gz/sha512/50ae225555b31a9ae31ce70c8489fd39718f274a8a0d4432f59b8e689f1b049614a148c389036458a53953485683cd9846b3a9413cd83d8a32b312f7d61b0650
31+
p7zip.v17.7.0+0.x86_64-linux-gnu.tar.gz/md5/c3a9a8e0c1870b7a841c3b3a37220a07
32+
p7zip.v17.7.0+0.x86_64-linux-gnu.tar.gz/sha512/75d8150566ac29ba06416767b742cf9c222da9e2c8c48dc8da7f5c0241c41b8e767db0aff9e14cc9240e8662c591505c872e850ad472b234951ab32799790d0c
33+
p7zip.v17.7.0+0.x86_64-linux-musl.tar.gz/md5/34925d3032cdcd953c36ded1625f5e33
34+
p7zip.v17.7.0+0.x86_64-linux-musl.tar.gz/sha512/03d4e24015498e6e6b025e9ba2d25e43dcb8af3d78c49c9fb34fe2e0d75010c0cb09476dc317ef54f03e4e16449b25dab81121a4b3c54a565700d1a16ad958dc
35+
p7zip.v17.7.0+0.x86_64-unknown-freebsd.tar.gz/md5/a1fea324148e8082db4657c195b91984
36+
p7zip.v17.7.0+0.x86_64-unknown-freebsd.tar.gz/sha512/ecf5b278077edc4e0e73e9d091c9f9d4b2edfbe742f2de8f05411a32ee0fd58d8adea2915f9295345ea1082a01f41719d1b3ed1744225ea4e129abd3785f4df3
37+
p7zip.v17.7.0+0.x86_64-w64-mingw32.tar.gz/md5/f0279fe7836fc0949410c8889c6ae09f
38+
p7zip.v17.7.0+0.x86_64-w64-mingw32.tar.gz/sha512/79dfa0324f050202f091197102fa4749373ee737a86dcb37980d73a4795677431144f8308890eeae1ecc30d8f1694b19a3a08f963c1a91536a3f2f3d438b5dd7

‎deps/p7zip.mk‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,26 @@ include $(SRCDIR)/p7zip.version
33

44
ifneq ($(USE_BINARYBUILDER_P7ZIP),1)
55

6-
P7ZIP_BUILD_OPTS := bindir=$(build_private_libexecdir) CC="$(CC)" CXX="$(CXX)"
6+
$(SRCCACHE)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz: | $(SRCCACHE)
7+
$(JLDOWNLOAD) $@ https://downloads.sourceforge.net/project/sevenzip/7-Zip/$(P7ZIP_VER)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz
78

8-
$(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz: | $(SRCCACHE)
9-
$(JLDOWNLOAD) $@ https://github.com/p7zip-project/p7zip/archive/refs/tags/v$(P7ZIP_VER).tar.gz
10-
11-
$(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz
9+
$(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted: $(SRCCACHE)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz
1210
$(JLCHECKSUM) $<
1311
mkdir -p $(dir $@)
14-
cd $(dir $@) && $(TAR) --strip-components 1 -zxf $<
12+
cd $(dir $@) && $(TAR) -Jxf $<
1513
echo 1 > $@
1614

17-
checksum-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz
15+
checksum-p7zip: $(SRCCACHE)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz
1816
$(JLCHECKSUM) $<
1917

2018
$(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted
2119
$(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured
22-
$(MAKE) -C $(dir $<) $(MAKE_COMMON) $(P7ZIP_BUILD_OPTS) 7za
20+
$(MAKE) -C $(dir $<)CPP/7zip/Bundles/Alone -f makefile.gcc
2321
echo 1 > $@
2422

2523
define P7ZIP_INSTALL
2624
mkdir -p $2/$$(build_private_libexecdir)/
27-
cp -a $1/bin/7za$(EXE) $2/$$(build_private_libexecdir)/7z$(EXE)
25+
cp -a $1/CPP/7zip/Bundles/Alone/_o/7za$(EXE) $2/$$(build_private_libexecdir)/7z$(EXE)
2826
endef
2927
$(eval $(call staged-install, \
3028
p7zip,p7zip-$(P7ZIP_VER), \
@@ -36,10 +34,10 @@ clean-p7zip:
3634
-$(MAKE) -C $(BUILDDIR)/p7zip-$(P7ZIP_VER) $(MAKE_COMMON) $(P7ZIP_BUILD_OPTS) clean
3735

3836
distclean-p7zip:
39-
rm -rf $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz $(SRCCACHE)/p7zip-$(P7ZIP_VER) $(BUILDDIR)/p7zip-$(P7ZIP_VER)
37+
rm -rf $(SRCCACHE)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz $(SRCCACHE)/p7zip-$(P7ZIP_VER) $(BUILDDIR)/p7zip-$(P7ZIP_VER)
4038

4139

42-
get-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz
40+
get-p7zip: $(SRCCACHE)/7z$(subst .,,$(P7ZIP_VER))-src.tar.xz
4341
extract-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER)/source-extracted
4442
configure-p7zip: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured
4543
compile-p7zip: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled
@@ -57,15 +55,8 @@ post-install-p7zip: $(build_prefix)/manifest/p7zip
5755
mkdir -p $(build_private_libexecdir)/
5856
[ ! -e $(build_bindir)/7z$(EXE) ] || mv $(build_bindir)/7z$(EXE) $(build_private_libexecdir)/7z$(EXE)
5957
[ -e $(build_private_libexecdir)/7z$(EXE) ]
60-
ifeq ($(OS),WINNT)
61-
[ ! -e $(build_bindir)/7z.dll ] || mv $(build_bindir)/7z.dll $(build_private_libexecdir)/7z.dll
62-
[ -e $(build_private_libexecdir)/7z.dll ]
63-
endif
6458
pre-uninstall-p7zip:
6559
-rm -f $(build_private_libexecdir)/7z$(EXE)
66-
ifeq ($(OS),WINNT)
67-
-rm -f $(build_private_libexecdir)/7z.dll
68-
endif
6960

7061
.PHONY: post-install-p7zip pre-uninstall-p7zip
7162

‎deps/p7zip.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
P7ZIP_JLL_NAME := p7zip
33

44
## source build
5-
P7ZIP_VER := 17.06
5+
P7ZIP_VER := 25.01

‎stdlib/Manifest.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,6 @@ uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
300300
version = "1.66.0+0"
301301

302302
[[deps.p7zip_jll]]
303-
deps = ["Artifacts", "Libdl"]
303+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
304304
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
305-
version = "17.6.0+0"
305+
version = "17.7.0+0"

‎stdlib/p7zip_jll/Project.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name = "p7zip_jll"
22
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
3-
version = "17.6.0+0"
3+
version = "17.7.0+0"
44

55
[deps]
6-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
76
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
7+
CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
8+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
89

910
[compat]
1011
julia = "1.6"

0 commit comments

Comments
 (0)