From: non-Jedi <non-Jedi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] julia: update to 1.5.0.
Date: Thu, 06 Aug 2020 23:39:46 +0200 [thread overview]
Message-ID: <20200806213946.nuq6HXOHT0m-ZQCGyV6_Y3Qhkuop7ySlP0mP-DReI-4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24097@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
There is an updated pull request by non-Jedi against master on the void-packages repository
https://github.com/non-Jedi/void-packages julia1.5
https://github.com/void-linux/void-packages/pull/24097
julia: update to 1.5.0.
The issues from <https://github.com/void-linux/void-packages/issues/21960> have been resolved, so system libgit2 is used instead of vendoring in dependency.
Switching from using skiprdeps to noverifyrdeps so that dependency
isn't falsely detected on libraries julia vendors
<https://github.com/void-linux/void-packages/issues/23997#issuecomment-667626936>.
[ci skip] because llvm takes too long to build.
Builds fine on my x86_64 glibc machine, and in principle we should be able to build julia on other supported architectures (armv7, aarch64, and x86_64-musl), but I don't have void installs to test that on.
EDIT: I was unsuccessful at getting musl to build locally failing to build llvm with:
> /usr/bin/ld: /builddir/julia-1.5.0/usr/lib/libunwind.a(Ltrace.o): relocation R_X86_64_TPOFF32 against `tls_cache_destroyed' can not be used when making a shared object; recompile with -fPIC
A patch file from https://github.com/void-linux/void-packages/pull/24097.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-julia1.5-24097.patch --]
[-- Type: text/x-diff, Size: 4824 bytes --]
From bf8b911ce9dbcbd930ffff2ecac833d92cda0b73 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Mon, 3 Aug 2020 11:14:03 -0400
Subject: [PATCH 1/2] julia: update to 1.5.0.
The issues from
<https://github.com/void-linux/void-packages/issues/21960>, so system
libgit2 is used instead of vendoring in dependency.
Switching from using skiprdeps to noverifyrdeps so that dependency
isn't falsely detected on libraries julia vendors
<https://github.com/void-linux/void-packages/issues/23997#issuecomment-667626936>.
---
srcpkgs/julia/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 80f6d001a74..1e5744fc6f6 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,6 +1,6 @@
# Template file for 'julia'
pkgname=julia
-version=1.4.2
+version=1.5.0
revision=1
archs="i686* x86_64*"
build_style=gnu-makefile
@@ -8,7 +8,7 @@ make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
USE_LLVM_SHLIB=1 USE_BINARYBUILDER=0
USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBUNWIND=0 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0
USE_SYSTEM_DSFMT=0 USE_SYSTEM_LLVM=0 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=0
- USE_SYSTEM_GMP=1 USE_SYSTEM_LIBGIT2=0 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1
+ USE_SYSTEM_GMP=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1
USE_SYSTEM_CURL=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_UTF8PROC=0
USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LAPACK=0"
make_install_args="$make_build_args"
@@ -16,21 +16,21 @@ make_check_args="$make_build_args"
make_check_target=testall
conf_files="/etc/julia/startup.jl"
hostmakedepends="perl cmake python gcc-fortran patchelf which tar xz"
-makedepends="pcre2-devel gmp-devel mpfr-devel libcurl-devel
+makedepends="pcre2-devel gmp-devel libgit2-devel mpfr-devel libcurl-devel
libssh2-devel mbedtls-devel libatomic-devel zlib-devel p7zip"
-depends="pcre2 gmp mpfr libcurl libssh2 mbedtls libatomic zlib p7zip"
+depends="pcre2 gmp libgit2 mpfr libcurl libssh2 mbedtls libatomic zlib p7zip libstdc++"
short_desc="High-level, high-performance dynamic programming language"
maintainer="Adam Beckmeyer <adam_git@thebeckmeyers.xyz>"
license="MIT"
homepage="https://julialang.org"
distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"
-checksum=948c70801d5cce81eeb7f764b51b4bfbb2dc0b1b9effc2cb9fc8f8cf6c90a334
+checksum=4a6ffadc8dd04ca0b7fdef6ae203d0af38185e57b78f7c0b972c4707354a6d1b
nocross=yes
-# Falsely detects dependency on libllvm
-skiprdeps="/usr/lib/libjulia.so.1.4 /usr/lib/julia/libllvmcalltest.so"
+noverifyrdeps="Julia vendors in libllvm, libgcc, libgfortran and libquadmath"
case "$XBPS_TARGET_MACHINE" in
*-musl)
+ depends+=" musl"
broken="fails to compile internal LLVM"
;;
i686-musl)
@@ -43,6 +43,9 @@ x86_64-musl)
depends+=" libexecinfo"
LDFLAGS="-lexecinfo"
;;
+*)
+ depends+=" glibc"
+ ;;
esac
case "$XBPS_TARGET_MACHINE" in
From e66af0b67dd117ef84151d124d50f0ee692b28fe Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Thu, 6 Aug 2020 17:37:47 -0400
Subject: [PATCH 2/2] julia: enable building on other archs.
x86_64-musl built fine locally, and julia upstream claims to support
armv7 and aarch64 on glibc as well. It's worth checking whether they
can successfully build.
[ci skip] for llvm build.
---
srcpkgs/julia/template | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 1e5744fc6f6..30c3b7921f6 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -2,7 +2,7 @@
pkgname=julia
version=1.5.0
revision=1
-archs="i686* x86_64*"
+archs="i686* x86_64* armv7l aarch64"
build_style=gnu-makefile
make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
USE_LLVM_SHLIB=1 USE_BINARYBUILDER=0
@@ -31,17 +31,6 @@ noverifyrdeps="Julia vendors in libllvm, libgcc, libgfortran and libquadmath"
case "$XBPS_TARGET_MACHINE" in
*-musl)
depends+=" musl"
- broken="fails to compile internal LLVM"
- ;;
-i686-musl)
- makedepends+=" libexecinfo-devel"
- depends+=" libexecinfo"
- LDFLAGS="-lexecinfo -lc"
- ;;
-x86_64-musl)
- makedepends+=" libexecinfo-devel"
- depends+=" libexecinfo"
- LDFLAGS="-lexecinfo"
;;
*)
depends+=" glibc"
@@ -63,6 +52,18 @@ x86_64*)
export CXXFLAGS="-march=x86-64"
make_build_args+=" MARCH=x86-64"
;;
+armv7l*)
+ export M="armv7-a"
+ export CFLAGS="-march=armv7-a"
+ export CXXFLAGS="-march=armv7-a"
+ make_build_args+=" MARCH=armv7-a"
+ ;;
+aarch64*)
+ export M="armv8-a"
+ export CFLAGS="-march=armv8-a"
+ export CXXFLAGS="-march=armv8-a"
+ make_build_args+=" MARCH=armv8-a"
+ ;;
esac
post_extract() {
next prev parent reply other threads:[~2020-08-06 21:39 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-06 2:50 [PR PATCH] " non-Jedi
2020-08-06 14:12 ` non-Jedi
2020-08-06 21:39 ` non-Jedi [this message]
2020-08-06 21:41 ` [PR PATCH] [Updated] " non-Jedi
2020-08-24 2:17 ` rjpower4
2020-08-24 18:41 ` non-Jedi
2020-08-25 14:56 ` ahesford
2020-08-25 15:01 ` [PR REVIEW] " ahesford
2020-08-25 15:25 ` ericonr
2020-08-25 16:33 ` [PR REVIEW] " non-Jedi
2020-08-25 19:22 ` [PR PATCH] [Updated] " ahesford
2020-08-25 19:26 ` ahesford
2020-08-25 19:53 ` [PR REVIEW] " non-Jedi
2020-08-25 19:53 ` non-Jedi
2020-08-25 19:53 ` non-Jedi
2020-08-25 19:56 ` non-Jedi
2020-08-25 19:59 ` non-Jedi
2020-08-25 20:00 ` non-Jedi
2020-08-25 20:04 ` ahesford
2020-08-25 20:05 ` ahesford
2020-08-25 20:09 ` ahesford
2020-08-25 20:09 ` ahesford
2020-08-25 20:18 ` non-Jedi
2020-08-25 20:20 ` non-Jedi
2020-08-25 20:21 ` non-Jedi
2020-08-25 20:29 ` non-Jedi
2020-08-25 20:47 ` ahesford
2020-08-25 21:32 ` [PR PATCH] [Updated] " ahesford
2020-08-25 21:33 ` ahesford
2020-08-26 1:58 ` [PR PATCH] [Updated] " non-Jedi
2020-08-26 2:00 ` non-Jedi
2020-08-26 2:03 ` [PR REVIEW] " non-Jedi
2020-08-26 2:14 ` non-Jedi
2020-08-26 2:30 ` [PR PATCH] [Updated] " ahesford
2020-08-26 2:30 ` ahesford
2020-08-26 2:44 ` [PR REVIEW] " ahesford
2020-08-26 2:46 ` non-Jedi
2020-08-26 2:52 ` ahesford
2020-08-26 2:56 ` non-Jedi
2020-08-26 2:57 ` non-Jedi
2020-08-26 4:06 ` [PR PATCH] [Closed]: " ahesford
2020-08-26 4:09 ` ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200806213946.nuq6HXOHT0m-ZQCGyV6_Y3Qhkuop7ySlP0mP-DReI-4@z \
--to=non-jedi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).