Github messages for voidlinux
 help / color / mirror / Atom feed
From: non-Jedi <non-Jedi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] julia: update to 1.6.0.
Date: Wed, 31 Mar 2021 14:41:45 +0200	[thread overview]
Message-ID: <20210331124145.nTS5NRt0T4U6ws0XxkfGIVRqERUknKtVI3Q0cF86ySA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29758@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1808 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.6.0
https://github.com/void-linux/void-packages/pull/29758

julia: update to 1.6.0.
Built successfully and appears to be working fine on x86_64 glibc. Test suite doesn't pass and hasn't been passing unless you build julia using all vendored (and heavily patched) dependencies (including llvm).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29758.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-julia1.6.0-29758.patch --]
[-- Type: text/x-diff, Size: 3474 bytes --]

From d46ac5c4f145e1a96baefd382fbda6ca7b799594 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Thu, 25 Mar 2021 17:21:30 -0400
Subject: [PATCH] julia: update to 1.6.0.

---
 srcpkgs/julia/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 56eb8f9511d1..4df23ca8ac23 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,38 +1,39 @@
 # Template file for 'julia'
 pkgname=julia
-version=1.5.3
-revision=2
+version=1.6.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
  USE_BINARYBUILDER=0 USE_SYSTEM_LIBM=0 USE_SYSTEM_DSFMT=0 USE_SYSTEM_LIBUV=0
  USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_BLAS=0 USE_SYSTEM_LAPACK=0 USE_SYSTEM_LLVM=1
  USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_GMP=1 USE_SYSTEM_PATCHELF=1
- USE_SYSTEM_MPFR=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_CURL=1
- USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_UTF8PROC=1
+ USE_SYSTEM_MPFR=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_NGHTTP2=1
+ USE_SYSTEM_CURL=1 USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LIBGIT2=1
+ USE_SYSTEM_UTF8PROC=1
  UTF8PROC_INC='${XBPS_CROSS_BASE}/usr/include/libutf8proc'"
 make_install_args="$make_build_args"
 make_check_args="$make_build_args"
 make_check_target=testall
 conf_files="/etc/julia/startup.jl"
 hostmakedepends="pkg-config perl cmake python gcc-fortran patchelf which tar xz"
-makedepends="p7zip pcre2-devel mpfr-devel libgit2-devel libcurl-devel
+makedepends="p7zip pcre2-devel mpfr-devel libgit2-devel libcurl-devel nghttp2-devel
  libssh2-devel mbedtls-devel libatomic-devel zlib-devel libunwind-devel
- libutf8proc-devel llvm10"
+ libutf8proc-devel llvm11"
 # Julia provides vendored symlinks in /usr/lib/julia pointing to these libraries,
 # but none of the julia executables link to them so these are not auto-detected
-depends="libgit2 libcurl mpfr mbedtls libpcre2 libssh2 libquadmath p7zip"
+depends="libgit2 libcurl mpfr mbedtls libatomic libpcre2 libssh2 nghttp2 libquadmath libssp p7zip"
 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=fb69337ca037576758547c7eed9ae8f153a9c052318327b6b7f1917408c14d91
+checksum=1b05f42c9368bc2349c47363b7ddc175a2da3cd162d52b6e24c4f5d4d6e1232c
 nocross="build system is a mess"
 # Targets for the vendored symlinks mentioned above
 shlib_requires="libgit2.so.1.0 libcurl.so.4 libmpfr.so.6 libgmp.so.10
  libmbedcrypto.so.3 libmbedtls.so.12 libmbedx509.so.0 libpcre2-8.so.0
- libssh2.so.1 libquadmath.so.0"
+ libssh2.so.1 libquadmath.so.0 libnghttp2.so.14 libatomic.so.1 libssp.so.0"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*)
@@ -85,8 +86,8 @@ post_install() {
 
 	# julia needlessly copies system libraries into a vendor directory
 	local _lib
-	for _lib in libgcc_s.so.1 libgfortran.so.5 libquadmath.so.0; do
-		rm -f "${DESTDIR}/usr/lib/julia/${_lib}"
+	for _lib in libgcc_s.so.1 libgfortran.so.5 libquadmath.so.0 libatomic.so.1 libstdc++.so.6 libssp.so.0; do
+		rm "${DESTDIR}/usr/lib/julia/${_lib}"
 		ln -s "/usr/lib/${_lib}" "${DESTDIR}/usr/lib/julia"
 	done
 }

  parent reply	other threads:[~2021-03-31 12:41 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-25 21:27 [PR PATCH] " non-Jedi
2021-03-26  1:16 ` non-Jedi
2021-03-26  1:22 ` ahesford
2021-03-26  1:24 ` ahesford
2021-03-26 15:25 ` non-Jedi
2021-03-26 21:56 ` ahesford
2021-03-30  4:15 ` [PR REVIEW] " ahesford
2021-03-30  4:15 ` ahesford
2021-03-31 12:40 ` [PR PATCH] [Updated] " non-Jedi
2021-03-31 12:41 ` non-Jedi [this message]
2021-03-31 15:21 ` non-Jedi
2021-03-31 18:13 ` [PR PATCH] [Merged]: " ahesford
2021-03-31 19:35 ` ahesford
2021-03-31 22:43 ` non-Jedi
2021-04-01 21:27 ` non-Jedi
2021-04-02 16:20 ` non-Jedi
2021-04-02 16:22 ` non-Jedi
2021-04-02 18:15 ` 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=20210331124145.nTS5NRt0T4U6ws0XxkfGIVRqERUknKtVI3Q0cF86ySA@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).