Skip to content

Update PCRE2 version to 10.34. Fixes #35322 #35459 #35607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredrikekre merged 4 commits into from
May 1, 2020
Merged

Update PCRE2 version to 10.34. Fixes #35322 #35459 #35607

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bab1889
Update PCRE2 version to 10.43. Fixes #35322 #35459
Micket Apr 27, 2020
e8c7614
Update PCRE download url to JuliaBinaryWrappers
Micket Apr 28, 2020
b7eb69f
Add checksums for PCRE 10.34
Micket Apr 28, 2020
7d80396
Drop PCRE2 10.31 checksums
Micket Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/Versions.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LLVM_VER = 9.0.1
LLVM_BB_REL = 6
PCRE_VER = 10.31
PCRE_VER = 10.34
PCRE_BB_REL = 0
DSFMT_VER = 2.2.3
DSFMT_BB_REL = 0
Expand Down
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0-0.x86_64-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cc31b7f57125e08afd046635bb353ac1
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0-0.x86_64-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c4713252a9a61d3f0d2e811068363946e8fe83675ac5c24c31b3dd497e1ba036b042be6652da100809fe123e2274b7afb5b5d2581ac1aa679a86a17c9d2084df
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.aarch64-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13df730117d10826297be40e5d3d85a1
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.aarch64-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3f8d4cbd206a0feaf407561391fe33bb0e5c80fdea433c0a373a14b52f79ccf442d8ad14679d82f9270141e4ffefe8b3114f5ca505a22dc1e1e0b7178abe780f
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.aarch64-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
38d063581295fc400eddf9a1cb811748
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.aarch64-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fb3a96d19eacde51d1994de5d5d499cc3593f15b716d6bec806c32e81f23cb651199211b2010465825cc7810ee64ce02aafa3c5c6b9b7b2b4e187effb9d56b8
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.armv7l-linux-gnueabihf.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8fad60e0fc886ab0601276f2edcfa93c
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.armv7l-linux-gnueabihf.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0cc20b59986ae4bc7fd35d186909874445503cc1bc150c731247bb32f35fc33fb47bd76c8eb18ea84cc5f1ed6ed851e3e43402f3b2854209e138b3a92404b4b8
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.armv7l-linux-musleabihf.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4fedff1803ffd7c45f61c9fb56539a59
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.armv7l-linux-musleabihf.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e595135a167d52bcf9e309e1a77c4739edd74ae592c82433ad7d3565148d9a91ea68619515e69bbb4fd4872473bd9da67cb1e961d594711c8f44309b29529f06
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a89fe2254c0a18f69cf039766e8a8ffb
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c4e31352be3543e21262f2bf20fcc7c7ddd8608935b430009907171e40599d0be7daedbe1e722a6a705356dfcb8a9e65416d8bd552cda94c66bd8e9fc0e496f
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cc28dc4686af36a0e0bec3c749cac19b
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
af2e5e21127d61712a4031dd0f7418dc17c8fd2498419b71c2cd64e9ec539029e837adcdbae8d889fce0de7de72031cac4bb7bdcbfa2dcef55f5ad05db72e9cd
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-w64-mingw32.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
324efeeefdbf634b62aff52ff223de22
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.i686-w64-mingw32.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71cdc2162311843f91912cd4f004c1bbaaaea7a3e88ca0a51d70d67858906729511c1ac991cd3ae6042d9438f93be9855fdf8253fef7557c730af2ea709495c3
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.powerpc64le-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a010e0df130c4e612eb40b4380f3ab1a
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.powerpc64le-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d74d2b5d5f14260b80c79fdec8d17d7039cef9209d32e58af379f8f4a92d055c836ee164763893d4ff2e9bb1e9253d56e67c9c2f862e1b2ec44cfa8a28987ece
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-apple-darwin14.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
623ce3432731da7eb3fe02d7f558287e
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-apple-darwin14.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
60af119c12aa2b8ac227955353cfd03661e93ca0ab4d9af7ce814211bc2a00bbb7e89d9ef057188cd3ce9045b2af32a7025ac61d2e75817b09f350dabfd26a66
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cc31b7f57125e08afd046635bb353ac1
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c4713252a9a61d3f0d2e811068363946e8fe83675ac5c24c31b3dd497e1ba036b042be6652da100809fe123e2274b7afb5b5d2581ac1aa679a86a17c9d2084df
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2d2c4272fcda4783c4965b0b7ea31ded
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
57f267e7cda10d3e5c3921bc00c087ca406451ca7e469f32b3cf99570d66c2861d75ed305b6d0d2e3eecf93a49d4783a15fb1ad90c1399011a464bbe4c8f3745
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-unknown-freebsd11.1.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d842884dbee1e639f2f7317cd4b5cb2e
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-unknown-freebsd11.1.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
40ba1e73a6c09ce3993221875ff257a0d4f3f0b96e428775584a7aaff0fec19ee9e8953bbaabaa7c888b03283fbe38c431e5366f5f020453323c402c2b70eb86
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-w64-mingw32.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
185de3eb09fd7e665963bb7587012c9e
1 change: 1 addition & 0 deletions deps/checksums/PCRE2.v10.34.0.x86_64-w64-mingw32.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c8b1863c2a98383fc8ab8d0a0c7e2b595d4c1e8381608eeff9f8c6fa6981891acbeaa1e6e7a3efe5fc9a155561e45ead9fb2a572a34f0331550a88483feb4b37
1 change: 1 addition & 0 deletions deps/checksums/pcre2-10.34.tar.bz2/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d280b62ded13f9ccf2fac16ee5286366
1 change: 1 addition & 0 deletions deps/checksums/pcre2-10.34.tar.bz2/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
2 changes: 1 addition & 1 deletion deps/pcre.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fastcheck-pcre: check-pcre
check-pcre: $(BUILDDIR)/pcre2-$(PCRE_VER)/build-checked

else # USE_BINARYBUILDER_PCRE
PCRE_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/PCRE2-v$(PCRE_VER)-$(PCRE_BB_REL)
PCRE_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/PCRE2_jll.jl/releases/download/PCRE2-v$(PCRE_VER).0+$(PCRE_BB_REL)
Copy link
Member

@KristofferC KristofferC Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this .0 be moved to PCRE_VER in Make.inc instead?

Copy link
Contributor Author

@Micket Micket Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then it wouldn't work when downloading the sources instead:
https://github.com/JuliaLang/julia/blob/master/deps/pcre.mk#L9
(I'm not sure why PCRE2_jll insist on adding another number suffix, it really is just 10.34, https://ftp.pcre.org/pub/pcre/)

Copy link
Member

@giordano giordano Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I'm not sure why PCRE2_jll insist on adding another number suffix, it really is just 10.34, ftp.pcre.org/pub/pcre)

Because JLL packages use Julia's VersionNumber representation in string interpolation:

julia> "$(v"10.34")"
"10.34.0"

PCRE_BB_NAME := PCRE2.v$(PCRE_VER).0

$(eval $(call bb-install,pcre,PCRE,false))
Expand Down