Skip to content

Commit 84f859e

Browse files
nhz2KristofferC
nhz2
authored and
KristofferC
committed
p7zip 17.7.0 (#60025)
1 parent c4448e2 commit 84f859e

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.05.tar.gz/md5/de921a08f37242a8eed8e4a758fbcb58
2-
p7zip-17.05.tar.gz/sha512/97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d
3-
p7zip.v17.5.0+2.aarch64-apple-darwin.tar.gz/md5/2a254e251901b3d1ddfd7aff23a6e5eb
4-
p7zip.v17.5.0+2.aarch64-apple-darwin.tar.gz/sha512/8efb9a2c9bcab388e523adba3dc0b876e8ae34e2440c3eee01fd780eb87c8619c7a7bbdc46d703ccefff6aa6ad64c4e4b45b723136ab1f6fd6de4f52e75ebbbf
5-
p7zip.v17.5.0+2.aarch64-linux-gnu.tar.gz/md5/bb1f3773fd409dbb91a10f7d9d2e99b5
6-
p7zip.v17.5.0+2.aarch64-linux-gnu.tar.gz/sha512/e95ccc342be644570d218d25403b91a7db9ee983fbf8cce3deff453355d68d426f9301eaac865a98691025b596b8cd77ebebf6184c0eaf8b2f294bc6763b9a4b
7-
p7zip.v17.5.0+2.aarch64-linux-musl.tar.gz/md5/3fac518a6a70412294d71ca510958cf2
8-
p7zip.v17.5.0+2.aarch64-linux-musl.tar.gz/sha512/fc127790739bf8a8b918b2e83753d86f5e79ee8706bde4cc79d74d9f7d846aae99a109da4b2b3cc92ccedc1eef4d52a555a65a95f588e173e0fecc11f2ca21e6
9-
p7zip.v17.5.0+2.aarch64-unknown-freebsd.tar.gz/md5/4190f8d7d42572b3fdab0fa382417d43
10-
p7zip.v17.5.0+2.aarch64-unknown-freebsd.tar.gz/sha512/5b0cb08374b8561873f76cb2b8bcbb8de1ff4c91bde23222cc1b650c6ea2fff265e48b6190551ed136324a47d25e1d357a754295b674e74b4628b20223ad067d
11-
p7zip.v17.5.0+2.armv6l-linux-gnueabihf.tar.gz/md5/355410848192de3b02d12fd663867f4b
12-
p7zip.v17.5.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/8f103b41e755d157d70dacca89a0ef4610bea109686b4005e8edd5f79ed2e6419c00c2625d0ab90e6e33fa389e670490d8de263c0bdae952cc34cbbf440e275f
13-
p7zip.v17.5.0+2.armv6l-linux-musleabihf.tar.gz/md5/34363b227306fce34a728af54b71064f
14-
p7zip.v17.5.0+2.armv6l-linux-musleabihf.tar.gz/sha512/8dd7b37ce6223c9fedcaa999eb806eb6dec8c4a3133d3c07e2456cb8543b8e4f5b881c1bff2d2e25f19b1312b18673e9013aeff87d6a274eec6c451b1ba0d6b9
15-
p7zip.v17.5.0+2.armv7l-linux-gnueabihf.tar.gz/md5/dbb1fc0cf3bea674442ff8cc932a94cd
16-
p7zip.v17.5.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/c4d71d905fa420391417786ed206a0c334475dd0df8baa1fc3f6560ce548db11805003d0d0b35bb622fe818c761f2b0abe0796d1cbfce2a922da69e697f056a2
17-
p7zip.v17.5.0+2.armv7l-linux-musleabihf.tar.gz/md5/d188b5dd453faedb616ba9c48fdeab6b
18-
p7zip.v17.5.0+2.armv7l-linux-musleabihf.tar.gz/sha512/ea30a775370502ca9e271b87cbda528d0c51d63ce0df41883d4dbc1527a32f251d797f3692fcf9b883b5fbaaad80515b971a8f8fe09ba102978b19a0ecb58528
19-
p7zip.v17.5.0+2.i686-linux-gnu.tar.gz/md5/dc02bdde045a0b6b22cf14d6960e63ed
20-
p7zip.v17.5.0+2.i686-linux-gnu.tar.gz/sha512/d2d0dd14a5fc1163fea2276e0925bfa8d075d5dba1d8018e4e3160977d3b09642b2e521d8e57d049abaf0e2ea391a846f0b0136b3c59e8b476c8c52ac5210447
21-
p7zip.v17.5.0+2.i686-linux-musl.tar.gz/md5/0b8658147938a8ec109ee2b3b0a0665f
22-
p7zip.v17.5.0+2.i686-linux-musl.tar.gz/sha512/411b2950f5928c537b87ba0651c09c08e57afed765db9fee89eda8b12939ef0da94c8ba38c0a24ba46b4513a0e4cca798eb09f2b20a011099ed3cf14455dd19e
23-
p7zip.v17.5.0+2.i686-w64-mingw32.tar.gz/md5/98bdd8767c77a35f71303ff490a3d363
24-
p7zip.v17.5.0+2.i686-w64-mingw32.tar.gz/sha512/14f08071af74297df8bfe1d9f7efa3c0212e62ace573848f17b729e4c36dc3861110f3c5cc9315364c318e5b040736443a24492e86d76161993653a309996eb3
25-
p7zip.v17.5.0+2.powerpc64le-linux-gnu.tar.gz/md5/b18c917b9852898a9b9d6d24bcc6863e
26-
p7zip.v17.5.0+2.powerpc64le-linux-gnu.tar.gz/sha512/0148dc8a0bc9c95212d7f8e2f92ee24e968eb7290fe72c7ae02e286bf5c05dd6b1f10b32350a7ff37777ed5a8cc21f3303f464620f3394c7a4690ae98bf77299
27-
p7zip.v17.5.0+2.riscv64-linux-gnu.tar.gz/md5/8d5f804091c2d21b2c35121d40d1024f
28-
p7zip.v17.5.0+2.riscv64-linux-gnu.tar.gz/sha512/68042f32b8b9f8d422dc0390efa2502d4a1a816daf4adf1133128f9366ec93ee1c1dda699844c0c3c3649a6b55a16312bd6b8fe4aedd6780e6faf11509932a9a
29-
p7zip.v17.5.0+2.x86_64-apple-darwin.tar.gz/md5/da31752a2556644d39e48649bb0111de
30-
p7zip.v17.5.0+2.x86_64-apple-darwin.tar.gz/sha512/0695ad111263d2fadfdf9a46ce7ee80def0bf60db7d1c2585ed2af6fc945fb169311a9f1ffc6f95fb43b0b03694d2d1be9136d3d78ba2ef2b19228987883a385
31-
p7zip.v17.5.0+2.x86_64-linux-gnu.tar.gz/md5/2fb55d86e4eaccb0488bd637d088b996
32-
p7zip.v17.5.0+2.x86_64-linux-gnu.tar.gz/sha512/38ac355157d59c09f308fc29964d0e9c1466c9633efd8d3c6ff3c738abce2af45ebc6b92a29f56d5e7baa4871f9f39b14ecfcbedd4e2f4ca7c0fe6627c6b13e7
33-
p7zip.v17.5.0+2.x86_64-linux-musl.tar.gz/md5/f0bd567a851d2dd9d306552ffafbca3a
34-
p7zip.v17.5.0+2.x86_64-linux-musl.tar.gz/sha512/e60047a6e7e3496cb6658f87c8c88676f399cd9f3d0d7daa880b6be09cd5525f7f22776896f1375722b47555514ff8c018f02ce800ec3fd0ed922e16e8a6d657
35-
p7zip.v17.5.0+2.x86_64-unknown-freebsd.tar.gz/md5/d37bd26e39a3ec84f262636f70624341
36-
p7zip.v17.5.0+2.x86_64-unknown-freebsd.tar.gz/sha512/0604a880c19f9d72d5828edd75be641625c29f230b3a5e7d70ec3812c014c96b76ee7b45e0e80f49be63f109a48700e75d1e5be01b5ae7b46d42dafda9885e8c
37-
p7zip.v17.5.0+2.x86_64-w64-mingw32.tar.gz/md5/f02c7b2481dee880b096340a8735350f
38-
p7zip.v17.5.0+2.x86_64-w64-mingw32.tar.gz/sha512/08b717c1b072d1309f6af8973eb09b1a482abb7ae7d01fba79873d4310a7c11292e2e8779029f99cc60627ed0d064224bc87782e587c520f970b840b7b838052
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$(EXE)
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.05
5+
P7ZIP_VER := 25.01

‎stdlib/Manifest.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,6 @@ uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
295295
version = "1.64.0+1"
296296

297297
[[deps.p7zip_jll]]
298-
deps = ["Artifacts", "Libdl"]
298+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
299299
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
300-
version = "17.5.0+2"
300+
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.5.0+2"
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)