Date: Saturday, December 24, 2022 @ 11:53:18 Author: arojas Revision: 1365384
upgpkg: julia 2:1.8.4-1: Update to 1.8.4 Added: julia/trunk/system-gcc-libs-symlink.patch Modified: julia/trunk/PKGBUILD -------------------------------+ PKGBUILD | 18 +++++++++++++----- system-gcc-libs-symlink.patch | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-24 11:22:16 UTC (rev 1365383) +++ PKGBUILD 2022-12-24 11:53:18 UTC (rev 1365384) @@ -8,8 +8,8 @@ pkgname=julia epoch=2 -pkgver=1.8.3 -pkgrel=4 +pkgver=1.8.4 +pkgrel=1 arch=(x86_64) pkgdesc='High-level, high-performance, dynamic programming language' url='https://julialang.org/' @@ -26,9 +26,10 @@ julia-libunwind-1.6.patch julia-system-cblas.patch julia-hardcoded-libs.patch - julia-suitesparse-version-mismatch.patch) + julia-suitesparse-version-mismatch.patch + system-gcc-libs-symlink.patch) backup=(etc/julia/startup.jl) -sha256sums=('52b6895a9d4ad2fe36db261ee8c4c8cc9212b837a12f93002faaf537a2151f50' +sha256sums=('1cd032262c5c42048a7819bccd684e843bbb8f66cf9ff56c315881ea431f0033' 'SKIP' 'ce0de27461197ade425cacdd3a642a6b2579e27c7ecc4a457e2b1bde2d76492a' '5d4093de84f836e16ec7f83736494e82804ab2fa37bc5594a5b99b1708dce322' @@ -36,7 +37,8 @@ 'cea321f7e16381dd795ee20d7bd5eda64f9b453c01d13e960962eb2723907e24' '65f24275edb8357ded3c53fd8a10c3d1ed13fa3d34a3869df0c04da10dba6c9d' '929a52a5503b6d1a21774c170ece0981cb7da1c1e7a5b7a2892cfb1251689b55' - '52c481d691940bbc4714d54cfde20fb1973350ba4a4c2386941a32fc007fdd85') + '52c481d691940bbc4714d54cfde20fb1973350ba4a4c2386941a32fc007fdd85' + '87fa75d54d00261d041dfc1040efdea1060356bf7afdbfa0c099f67b9fc9f787') validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <[email protected]> options=(!lto) @@ -53,9 +55,14 @@ patch -p1 -i ../julia-system-cblas.patch # Don't hardcode library names patch -p1 -i ../julia-hardcoded-libs.patch +# Fix symlinking system gcc libraries + patch -p1 -i ../system-gcc-libs-symlink.patch # Fix test failures due to using system blas sed -e 's|0.22314355f0 + 3.1415927f0im|0.22314355f0 - 3.1415927f0im|' -i stdlib/LinearAlgebra/test/lu.jl sed -e 's|\$Int|Int32|' -i stdlib/LinearAlgebra/test/lu.jl +# https://github.com/JuliaLang/julia/issues/47987 + mkdir -p usr/lib + ln -s /usr/lib/libstdc++.so.6 usr/lib # Fix warnings with suitesparse 6 cd stdlib/srccache tar -xzf SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc.tar.gz @@ -109,6 +116,7 @@ # TODO: Remove SuiteSparse from skip list in 1.9 (it is downloaded at build time from a separate repo, not easily patchable) ../julia --check-bounds=yes --startup-file=no ./runtests.jl \ + --skip Downloads \ --skip Sockets \ --skip nghttp2_jll \ --skip GMP_jll \ Added: system-gcc-libs-symlink.patch =================================================================== --- system-gcc-libs-symlink.patch (rev 0) +++ system-gcc-libs-symlink.patch 2022-12-24 11:53:18 UTC (rev 1365384) @@ -0,0 +1,23 @@ +From 782dd242ddb50a77f999c93c96e98ae028bf6ab7 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <[email protected]> +Date: Sat, 24 Dec 2022 11:14:31 +0100 +Subject: [PATCH] Restore libgcc_s symlinkin in !macOS + +Commit c8b72e2bf49046e8daca64214765694377277947 completely removed libgcc_s symlinking (I assume unintentionally) in !macOS. +--- + base/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/base/Makefile b/base/Makefile +index bb79549aeea2..c320465a1049 100644 +--- a/base/Makefile ++++ b/base/Makefile +@@ -227,6 +227,8 @@ else + $(eval $(call symlink_system_library,CSL,libgcc_s,1)) + endif + endif ++else ++$(eval $(call symlink_system_library,CSL,libgcc_s,1)) + endif + ifneq (,$(LIBGFORTRAN_VERSION)) + $(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
