[arch-commits] Commit in julia/trunk (PKGBUILD julia-hardcoded-libs.patch)

[Antonio Rojas]

    Date: Friday, March 26, 2021 @ 09:30:40
  Author: arojas
Revision: 904467

Move p7zip to depends (FS#70166), fix hardcoded library names (FS#70164)

Added:
  julia/trunk/julia-hardcoded-libs.patch
Modified:
  julia/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   18 ++++++++-----
 julia-hardcoded-libs.patch |   56 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-26 08:28:31 UTC (rev 904466)
+++ PKGBUILD	2021-03-26 09:30:40 UTC (rev 904467)
@@ -9,21 +9,22 @@
 pkgname=(julia julia-docs)
 epoch=2
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
 license=(MIT)
 depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas
-         suitesparse mbedtls openlibm pcre2 llvm-libs)
+         suitesparse mbedtls openlibm pcre2 llvm-libs p7zip)
 makedepends=(cmake gcc-fortran python llvm patchelf)
-checkdepends=(p7zip)
 source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
         julia-system-cblas.patch
+        julia-hardcoded-libs.patch
         make-install-no-build.patch)
 sha256sums=('c4c6872ee79fbe6391991057c3d0007e578b28d42572b0b35dace4107fe8bdf4'
             'SKIP'
             'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d'
+            '692a51efc1a9608720a8ec8899ad62e48f0f2bf43b71e495e16f0429e8a80441'
             '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d')
 # Julia (Binary signing key) <buildbot at julialang.org>
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
@@ -33,8 +34,12 @@
   cd $pkgbase-$pkgver
 
   patch -p1 -i ../julia-system-cblas.patch # Add and use option to build with system cblas
-  mkdir -p usr/lib && ln -s /usr/lib/libgcc_s.so.1 usr/lib # Workaround build failure with system gcc-libs
+  mkdir -p usr/lib/julia
+  ln -s /usr/lib/libgcc_s.so.1 usr/lib # Workaround build failure with system gcc-libs
 
+  # Don't hardcode library names
+  patch -p1 -i ../julia-hardcoded-libs.patch
+
   # Don't build again in install
   patch -p1 -i ../make-install-no-build.patch
 
@@ -77,13 +82,12 @@
 
  # this is the make testall target, plus the --skip option from
  # travis/appveyor/circleci (one test fails with DNS resolution errors)
+ # Also skip tests that check for a hardcoded version number
  ../julia --check-bounds=yes --startup-file=no ./runtests.jl all \
    --skip Sockets \
    --skip broadcast \
    --skip Distributed \
    --skip nghttp2_jll \
-   --skip libLLVM_jll \
-   --skip OpenBLAS_jll \
    --skip GMP_jll \
    --skip LibCURL \
    --skip LibSSH2_jll \
@@ -101,7 +105,7 @@
   optdepends=('gnuplot: If using the Gaston Package from julia')
 
   make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install $_buildopts
-  ln -s /usr/lib/libgcc_s.so.1 "$pkgdir"/usr/lib/julia
+  ln -s /usr/lib/libgcc_s.so.1 "$pkgdir"/usr/lib/julia # https://github.com/JuliaLang/julia/issues/40201
 
   # Documentation is in the julia-docs package.
   # Man pages in /usr/share/julia/doc/man are duplicate.

Added: julia-hardcoded-libs.patch
===================================================================
--- julia-hardcoded-libs.patch	                        (rev 0)
+++ julia-hardcoded-libs.patch	2021-03-26 09:30:40 UTC (rev 904467)
@@ -0,0 +1,56 @@
+diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+index a7ca666b23..b84a42f4e7 100644
+--- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
++++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+@@ -31,9 +31,9 @@ elseif Sys.isapple()
+     const libmbedtls = "@rpath/libmbedtls.13.dylib"
+     const libmbedx509 = "@rpath/libmbedx509.1.dylib"
+ else
+-    const libmbedcrypto = "libmbedcrypto.so.5"
+-    const libmbedtls = "libmbedtls.so.13"
+-    const libmbedx509 = "libmbedx509.so.1"
++    const libmbedcrypto = "libmbedcrypto.so"
++    const libmbedtls = "libmbedtls.so"
++    const libmbedx509 = "libmbedx509.so"
+ end
+ 
+ function __init__()
+diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
+index 4bed970f38..7ec61be8ea 100644
+--- a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
++++ b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
+@@ -18,7 +18,7 @@ libopenblas_handle = C_NULL
+ libopenblas_path = ""
+ 
+ if arch(HostPlatform()) in ("x86_64", "powerpc64le")
+-    const libsuffix = "64_"
++    const libsuffix = ""
+ else
+     const libsuffix = ""
+ end
+diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+index fa45e754e5..b51812e3a8 100644
+--- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
++++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+@@ -23,7 +23,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+     const libLLVM = "@rpath/libLLVM.dylib"
+ else
+-    const libLLVM = "libLLVM-11jl.so"
++    const libLLVM = "libLLVM.so"
+ end
+ 
+ function __init__()
+diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+index 8b98c76ac5..77ad9e3800 100644
+--- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
++++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+@@ -22,7 +22,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+     const libnghttp2 = "@rpath/libnghttp2.14.dylib"
+ else
+-    const libnghttp2 = "libnghttp2.so.14"
++    const libnghttp2 = "libnghttp2.so"
+ end
+ 
+ function __init__()