summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Munari2021-02-02 23:42:11 +0100
committerMarco Munari2021-02-03 22:37:51 +0100
commitd1fb1a99ba731edd4b7027bf1b08697a90ff470c (patch)
treec4e43a7962a5d628443b20b3bda0a500bde9a412
parent5092ff038b42ccb8479c2bd402da646ba406c0e2 (diff)
downloadaur-d1fb1a99ba731edd4b7027bf1b08697a90ff470c.tar.gz
fix patch to Makefile; add `(make)depends` zlib p7zip patchelf to meet Make.user
this is an intermediate commit before a complete fix julia Makefile needs to built contrib/stringreplace.c in usr/tools/ previously skipped with make-install-no-build.patch patchelf would be provided with julia/deps/ to run patchelf --set-rpath '$ORIGIN:$ORIGIN/..' pkg/julia-git/usr/lib/julia/libjulia-internal.so but is currently specified system provided in Make.user: USE_SYSTEM_PATCHELF:=1 Note: check() can be commented out in PKGBUILD to obtain a package, currently the following tests shown to report errors: LinearAlgebra/lu read stacktraces GMP_jll InteractiveUtils LibCURL LibGit2_jll LibSSH2_jll MbedTLS_jll MozillaCACerts_jll NetworkOptions OpenBLAS_jll REPL SuiteSparse_jll precompile then keeping the OpenBLAS patch but with USE_SYSTEM_BLAS:=1 only and all the others USE_SYSTEM_ to 0, test with error remains: LinearAlgebra/lu OpenBLAS_jll SuiteSparse_jll (the three related to OpenBLAS)
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--make-install-no-build.patch2
3 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 438a39b7e2c1..2de7ed3ddb41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,7 +36,7 @@ pkgbase = julia-git
sha256sums = 1aee33d62dcd8e6b65672bd9996a61c83e44056dd31efa79761cb85effb0e6a1
sha256sums = d4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d
sha256sums = 856dab2da8124df95e4fbd17f1164bebe1b10e99852fedf38f9dfe31f8ae295c
- sha256sums = 0b57e0bc6e25c92fde8a6474394f7a99bfb57f9b5d0f7b53f988622ae67de8b7
+ sha256sums = 09b6077149fa3d22b71b63e471f077d1f3dbeb39d682030c73c316e939e2cc19
pkgname = julia-git
optdepends = openblas-lapack: multithreaded replacement for lapack
diff --git a/PKGBUILD b/PKGBUILD
index 618d1c6c94f7..1e2cb89505a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgbase=julia
pkgbase=${_pkgbase}-git
pkgname=(julia-git julia-git-docs)
-pkgver=1.6.0.DEV.r47020.gb59417235f5
+pkgver=1.7.0.DEV.r48868.g7ecdcc53400
pkgrel=1
arch=(x86_64)
pkgdesc='High-level, high-performance, dynamic programming language'
@@ -27,10 +27,12 @@ depends=(
mpfr
openlibm
pcre2
+ zlib p7zip
xdg-utils desktop-file-utils
gtk-update-icon-cache
)
makedepends=(
+ patchelf
cmake gcc-fortran
python
git
@@ -44,7 +46,7 @@ sha256sums=('SKIP'
'1aee33d62dcd8e6b65672bd9996a61c83e44056dd31efa79761cb85effb0e6a1'
'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d'
'856dab2da8124df95e4fbd17f1164bebe1b10e99852fedf38f9dfe31f8ae295c'
- '0b57e0bc6e25c92fde8a6474394f7a99bfb57f9b5d0f7b53f988622ae67de8b7')
+ '09b6077149fa3d22b71b63e471f077d1f3dbeb39d682030c73c316e939e2cc19')
pkgver() {
diff --git a/make-install-no-build.patch b/make-install-no-build.patch
index 6d89d95be605..19eeb432dcbf 100644
--- a/make-install-no-build.patch
+++ b/make-install-no-build.patch
@@ -10,7 +10,7 @@
-else
- @$(MAKE) $(QUIET_MAKE) release
-endif
-+install:
++install: $(build_depsbindir)/stringreplace
@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \
mkdir -p $(DESTDIR)$$subdir; \
done