Skip to content
This repository has been archived by the owner on May 20, 2023. It is now read-only.

Commit

Permalink
Update to 1.7.3, fix failures with GCC 12
Browse files Browse the repository at this point in the history
git-svn-id: file:///srv/repos/svn-community/svn@1210389 9fca08f4-af9d-4005-b8df-a31f2cc04f65
  • Loading branch information
arojas authored and svntogit committed May 26, 2022
1 parent 27893c0 commit bee1243
Show file tree
Hide file tree
Showing 5 changed files with 532 additions and 65 deletions.
2 changes: 1 addition & 1 deletion trunk/63303980.patch
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,9 @@ index 7cd50ac144c1..57e90a9aa805 100644
namespace {

@@ -346,7 +341,7 @@ CloneCtx::CloneCtx(MultiVersioning *pass, Module &M)
T_int32(Type::getInt32Ty(ctx)),
T_void(Type::getVoidTy(ctx)),
T_psize(PointerType::get(T_size, 0)),
T_pvoidfunc(FunctionType::get(T_void, false)->getPointerTo()),
- tbaa_const(tbaa_make_child("jtbaa_const", nullptr, true).first),
+ tbaa_const(tbaa_make_child_with_context(ctx, "jtbaa_const", nullptr, true).first),
pass(pass),
Expand Down
31 changes: 10 additions & 21 deletions trunk/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

pkgname=julia
epoch=2
pkgver=1.7.2
pkgrel=3
pkgver=1.7.3
pkgrel=1
arch=(x86_64)
pkgdesc='High-level, high-performance, dynamic programming language'
url='https://julialang.org/'
Expand All @@ -31,28 +31,26 @@ source=(https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$
julia-system-cblas.patch
julia-hardcoded-libs.patch
make-install-no-build.patch
julia-llvm-patchelf.patch
julia-libunwind-1.6.patch
julia-curl-7.81.patch
julia-libblastrampoline-4.patch)
julia-libblastrampoline-4.patch
julia-gcc-12.patch)
backup=(etc/julia/startup.jl)
sha256sums=('c1b4f1f75aac34c40e81805cba2d87f1e72f9ce1405a525273c3688eee12366f'
sha256sums=('4be529b0716de1ec48ba52e83a0fafd4be2269be9cc43074ad15ce788aeca093'
'SKIP'
'a5cd89ce78157362377df382ce5a4fbef14543b818beecc06dfd6d63c90334f2'
'bbaea5ed91577a4633625a339dc1fb48cb4d74893e69bafc993db2953078891c'
'9a176b411414825f1694d3fbe377fdc0d4937883a9926db0f531dbac7e75464a'
'c033fce112db85b02ebc1d3c8f8bac1240e0409ffdded7fd3322163834c41257'
'bc6c85cbbca489ef0b2876dbeb6ae493c11573e058507b8bcb9e01273bc3a38c'
'ce9cd140c3bc39987d60340bf365d6238e79cf4d5385494272c49c64af22ef78'
'96303f5cb520e861c7fdc5eb6d64767b597ecf2057a0aa37250af546738da63e'
'40e1f46415a7241c1258d2e9d01890455ac728879a5cc6bb1d8f57d6e1f7a69a'
'cfe498a090d0026b92f9db4ed65ac3818c2efa5ec83bcefed728d27abff73081'
'8f8c12853ce847f5d1b5a4a461ddec701decdb81dae7bb31d66560c1deaed97a'
'03043f005c133ac9af1d4dc113ea8b525ad3b393690625be77975f0e29dd6457'
'8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
'6048c69c987f33f2b17d78b63368b0762d1d6a1e531ef9932d0c23bda49d1384'
'3afa172e8b54ce48e77542677b2b7143199d444bfeed39be1644ce88b513a3d0'
'710587dd88c7698dc5cdf47a1a50f6f144b584b7d9ffb85fac3f5f79c65fce11'
'79cd957d0599a8ee1dbdf7f2ebd1a5bd85ab7e499584858e89a8d9609ba1ced4')
'79cd957d0599a8ee1dbdf7f2ebd1a5bd85ab7e499584858e89a8d9609ba1ced4'
'b903859c262048057f873e4a39c4837382896d3059860465443823133a5a59da')
validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <[email protected]>
options=(!lto)

Expand Down Expand Up @@ -80,19 +78,10 @@ prepare() {
patch -p1 -i ../make-install-no-build.patch
# Fix test failure
sed -e 's|0.22314355f0 + 3.1415927f0im|0.22314355f0 - 3.1415927f0im|' -i stdlib/LinearAlgebra/test/lu.jl
# Don't try to run patchelf on system LLVM
patch -p1 -i ../julia-llvm-patchelf.patch
# Port to libblastrampoline 4 API
patch -p1 -i ../julia-libblastrampoline-4.patch

# Fix segfault with curl 7.81
cd stdlib/srccache
tar -xzf Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz
patch -d JuliaLang-Downloads.jl-26d79af -p1 < "$srcdir"/julia-curl-7.81.patch
rm Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz
tar -czf Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz JuliaLang-Downloads.jl-26d79af
md5sum Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz | cut -d ' ' -f 1 > ../../deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5
sha512sum Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz | cut -d ' ' -f 1 > ../../deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512
# Fix failures with GCC 12 https://github.com/JuliaLang/julia/pull/45249
patch -p0 -i ../julia-gcc-12.patch
}

_buildopts="prefix=/usr \
Expand Down
28 changes: 0 additions & 28 deletions trunk/julia-curl-7.81.patch

This file was deleted.

Loading

0 comments on commit bee1243

Please sign in to comment.