Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] julia: remove
@ 2022-10-12 20:18 Piraty
  2022-10-13 13:34 ` [PR PATCH] [Merged]: " Piraty
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Piraty @ 2022-10-12 20:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1413 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages remove-julia
https://github.com/void-linux/void-packages/pull/39919

julia: remove
* FTBFS: https://github.com/void-linux/void-packages/issues/34387
* unmaintained: https://github.com/void-linux/void-packages/pull/35270
* blocks libgit2 update

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39919.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-julia-39919.patch --]
[-- Type: text/x-diff, Size: 6752 bytes --]

From eb77528c71d32262148446d99892a3e024c5426e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 12 Oct 2022 22:06:23 +0200
Subject: [PATCH] julia: remove

* FTBFS: https://github.com/void-linux/void-packages/issues/34387
* unmaintained: https://github.com/void-linux/void-packages/pull/35270
* blocks libgit2 update
---
 .../julia/patches/julia-hardcoded-libs.patch  |  43 -------
 srcpkgs/julia/template                        | 110 ------------------
 srcpkgs/removed-packages/template             |   1 +
 3 files changed, 1 insertion(+), 153 deletions(-)
 delete mode 100644 srcpkgs/julia/patches/julia-hardcoded-libs.patch
 delete mode 100644 srcpkgs/julia/template

diff --git a/srcpkgs/julia/patches/julia-hardcoded-libs.patch b/srcpkgs/julia/patches/julia-hardcoded-libs.patch
deleted file mode 100644
index bf657361b980..000000000000
--- a/srcpkgs/julia/patches/julia-hardcoded-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/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__()
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
deleted file mode 100644
index 576b5beb9bf0..000000000000
--- a/srcpkgs/julia/template
+++ /dev/null
@@ -1,110 +0,0 @@
-# Template file for 'julia'
-pkgname=julia
-version=1.6.1
-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=0
- 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_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'"
-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 nghttp2-devel
- libssh2-devel mbedtls-devel libatomic-devel zlib-devel libunwind-devel
- libutf8proc-devel"
-# 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 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=71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f
-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 libnghttp2.so.14 libatomic.so.1 libssp.so.0"
-
-case "$XBPS_TARGET_MACHINE" in
-i686*)
-	export M="pentium4"
-	export CFLAGS="-march=pentium4"
-	export CXXFLAGS="-march=pentium4"
-	export LDFLAGS="-Wl,--no-keep-memory"
-
-	make_build_args+=" MARCH=pentium4 OPENBLAS_USE_THREAD=0"
-	;;
-x86_64*)
-	export M="x86-64"
-	export CFLAGS="-march=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
-case "$XBPS_TARGET_MACHINE" in
-i686-musl|ppc*-musl)
-	makedepends+=" libucontext-devel"
-	;;
-esac
-
-post_extract() {
-	vsed -i '/^install:/s| \$(BUILDROOT)/doc.*||' Makefile
-	case "$XBPS_TARGET_MACHINE" in
-	i686-musl|ppc*-musl)
-		# Make.inc does not use pkg-config libunwind.pc
-		vsed -i 's;-lunwind;& -lucontext;' Make.inc
-	esac
-}
-
-post_install() {
-	vlicense LICENSE.md
-
-	# julia needlessly copies system libraries into a vendor directory
-	local _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
-}
-
-julia-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-	}
-}
-
-julia-doc_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - documentation files"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 95efd3df45c8..5bf6f02de752 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -234,6 +234,7 @@ replaces="
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
+ julia<=1.6.1_2
  jwm-settings-manager<=2.1.5_1
  k3s<=1.0.0_1
  kadu<=4.3_6

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-17 17:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-12 20:18 [PR PATCH] julia: remove Piraty
2022-10-13 13:34 ` [PR PATCH] [Merged]: " Piraty
2022-10-18 23:27 ` Rabioli
2022-10-18 23:55 ` ahesford
2022-10-19  5:40 ` paper42
2023-03-17 17:35 ` BryceVandegrift
2023-03-17 17:36 ` BryceVandegrift

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).