| 1 |
commit: 60f9d0619455f6065cfe38fdd204193e754e8de0 |
| 2 |
Author: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jan 4 22:51:07 2022 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 5 11:00:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f9d061 |
| 7 |
|
| 8 |
dev-lang/julia: more LLVM 13 patches for 1.7.1 |
| 9 |
|
| 10 |
- I also minimized julia-1.7.1-do_not_set_rpath.patch |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/819381 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/23652 |
| 14 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 15 |
Signed-off-by: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail.com> |
| 16 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-lang/julia/Manifest | 3 + |
| 19 |
.../julia/files/julia-1.7.1-do_not_set_rpath.patch | 11 ++ |
| 20 |
dev-lang/julia/julia-1.7.1-r2.ebuild | 183 +++++++++++++++++++++ |
| 21 |
3 files changed, 197 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest |
| 24 |
index d24ea63f2732..97dcc962e7b7 100644 |
| 25 |
--- a/dev-lang/julia/Manifest |
| 26 |
+++ b/dev-lang/julia/Manifest |
| 27 |
@@ -1,6 +1,9 @@ |
| 28 |
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de |
| 29 |
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc |
| 30 |
DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce |
| 31 |
+DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f |
| 32 |
+DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 |
| 33 |
+DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c |
| 34 |
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638 |
| 35 |
DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240 |
| 36 |
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 |
| 37 |
|
| 38 |
diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch |
| 39 |
new file mode 100644 |
| 40 |
index 000000000000..7b8c3c7ba51b |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch |
| 43 |
@@ -0,0 +1,11 @@ |
| 44 |
+--- a/Makefile 2021-12-21 09:38:26.782829864 +0100 |
| 45 |
++++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 |
| 46 |
+@@ -365,7 +365,7 @@ |
| 47 |
+ endif |
| 48 |
+ |
| 49 |
+ # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD |
| 50 |
+-ifneq (,$(findstring $(OS),Linux FreeBSD)) |
| 51 |
++ifneq (,$(findstring $(OS),FreeBSD)) |
| 52 |
+ $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) |
| 53 |
+ endif |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild |
| 57 |
new file mode 100644 |
| 58 |
index 000000000000..50c67b8c1e00 |
| 59 |
--- /dev/null |
| 60 |
+++ b/dev-lang/julia/julia-1.7.1-r2.ebuild |
| 61 |
@@ -0,0 +1,183 @@ |
| 62 |
+# Copyright 1999-2022 Gentoo Authors |
| 63 |
+# Distributed under the terms of the GNU General Public License v2 |
| 64 |
+ |
| 65 |
+EAPI=7 |
| 66 |
+ |
| 67 |
+inherit llvm pax-utils toolchain-funcs |
| 68 |
+ |
| 69 |
+# correct versions for stdlibs are in deps/checksums |
| 70 |
+# for everything else, run with network-sandbox and wait for the crash |
| 71 |
+ |
| 72 |
+MY_LLVM_V="13.0.0" |
| 73 |
+ |
| 74 |
+DESCRIPTION="High-performance programming language for technical computing" |
| 75 |
+HOMEPAGE="https://julialang.org/" |
| 76 |
+ |
| 77 |
+SRC_URI=" |
| 78 |
+ https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz |
| 79 |
+ https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.0-llvm_13_compat_part_4.patch |
| 80 |
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.0-llvm_13_compat_part_5.patch |
| 81 |
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.0-llvm_13_compat_part_6.patch |
| 82 |
+" |
| 83 |
+ |
| 84 |
+LICENSE="MIT" |
| 85 |
+SLOT="0" |
| 86 |
+KEYWORDS="~amd64 ~x86" |
| 87 |
+IUSE="+system-llvm" |
| 88 |
+ |
| 89 |
+RDEPEND=" |
| 90 |
+ system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) |
| 91 |
+" |
| 92 |
+LLVM_MAX_SLOT=13 |
| 93 |
+ |
| 94 |
+RDEPEND+=" |
| 95 |
+ app-arch/p7zip |
| 96 |
+ dev-libs/gmp:0= |
| 97 |
+ dev-libs/libgit2:0 |
| 98 |
+ >=dev-libs/libpcre2-10.23:0=[jit,unicode] |
| 99 |
+ dev-libs/mpfr:0= |
| 100 |
+ >=dev-libs/libutf8proc-2.6.1:0=[-cjk] |
| 101 |
+ >=dev-util/patchelf-0.13 |
| 102 |
+ >=net-libs/mbedtls-2.2 |
| 103 |
+ net-misc/curl[http2,ssh] |
| 104 |
+ sci-libs/amd:0= |
| 105 |
+ sci-libs/arpack:0= |
| 106 |
+ sci-libs/camd:0= |
| 107 |
+ sci-libs/ccolamd:0= |
| 108 |
+ sci-libs/cholmod:0= |
| 109 |
+ sci-libs/colamd:0= |
| 110 |
+ sci-libs/fftw:3.0=[threads] |
| 111 |
+ sci-libs/openlibm:0= |
| 112 |
+ sci-libs/spqr:0= |
| 113 |
+ sci-libs/umfpack:0= |
| 114 |
+ >=sci-mathematics/dsfmt-2.2.4 |
| 115 |
+ >=sys-libs/libunwind-1.1:0= |
| 116 |
+ sys-libs/zlib:0= |
| 117 |
+ >=virtual/blas-3.6 |
| 118 |
+ virtual/lapack" |
| 119 |
+ |
| 120 |
+DEPEND="${RDEPEND} |
| 121 |
+ dev-util/patchelf |
| 122 |
+ virtual/pkgconfig |
| 123 |
+ !system-llvm? ( dev-util/cmake )" |
| 124 |
+ |
| 125 |
+PATCHES=( |
| 126 |
+ "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch |
| 127 |
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch |
| 128 |
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch |
| 129 |
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_4.patch |
| 130 |
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_5.patch |
| 131 |
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_6.patch |
| 132 |
+ "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch |
| 133 |
+ "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch |
| 134 |
+ "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch |
| 135 |
+ "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch |
| 136 |
+) |
| 137 |
+ |
| 138 |
+pkg_setup() { |
| 139 |
+ use system-llvm && llvm_pkg_setup |
| 140 |
+} |
| 141 |
+ |
| 142 |
+src_unpack() { |
| 143 |
+ local tounpack=(${A}) |
| 144 |
+ # the main source tree, followed by deps |
| 145 |
+ unpack "${tounpack[0]}" |
| 146 |
+ |
| 147 |
+ mkdir -p "${S}/deps/srccache/" |
| 148 |
+ for i in "${tounpack[@]:1}"; do |
| 149 |
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die |
| 150 |
+ done |
| 151 |
+} |
| 152 |
+ |
| 153 |
+src_prepare() { |
| 154 |
+ default |
| 155 |
+ |
| 156 |
+ # Sledgehammer: |
| 157 |
+ # - prevent fetching of bundled stuff in compile and install phase |
| 158 |
+ # - respect CFLAGS |
| 159 |
+ # - respect EPREFIX and Gentoo specific paths |
| 160 |
+ |
| 161 |
+ sed -i \ |
| 162 |
+ -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ |
| 163 |
+ Make.inc || die |
| 164 |
+ |
| 165 |
+ sed -i \ |
| 166 |
+ -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ |
| 167 |
+ src/Makefile || die |
| 168 |
+ |
| 169 |
+ # disable doc install starting git fetching |
| 170 |
+ sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die |
| 171 |
+} |
| 172 |
+ |
| 173 |
+src_configure() { |
| 174 |
+ use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." |
| 175 |
+ |
| 176 |
+ # julia does not play well with the system versions of libuv |
| 177 |
+ # USE_SYSTEM_LIBM=0 implies using external openlibm |
| 178 |
+ cat <<-EOF > Make.user |
| 179 |
+ LOCALBASE:="${EPREFIX}/usr" |
| 180 |
+ override prefix:="${EPREFIX}/usr" |
| 181 |
+ override libdir:="\$(prefix)/$(get_libdir)" |
| 182 |
+ override CC:=$(tc-getCC) |
| 183 |
+ override CXX:=$(tc-getCXX) |
| 184 |
+ override AR:=$(tc-getAR) |
| 185 |
+ |
| 186 |
+ BUNDLE_DEBUG_LIBS:=0 |
| 187 |
+ USE_BINARYBUILDER:=0 |
| 188 |
+ USE_SYSTEM_CSL:=1 |
| 189 |
+ USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) |
| 190 |
+ USE_SYSTEM_LIBUNWIND:=1 |
| 191 |
+ USE_SYSTEM_PCRE:=1 |
| 192 |
+ USE_SYSTEM_LIBM:=0 |
| 193 |
+ USE_SYSTEM_OPENLIBM:=1 |
| 194 |
+ USE_SYSTEM_DSFMT:=1 |
| 195 |
+ USE_SYSTEM_BLAS:=1 |
| 196 |
+ USE_SYSTEM_LAPACK:=1 |
| 197 |
+ USE_SYSTEM_LIBBLASTRAMPOLINE:=0 |
| 198 |
+ USE_SYSTEM_GMP:=1 |
| 199 |
+ USE_SYSTEM_MPFR:=1 |
| 200 |
+ USE_SYSTEM_LIBSUITESPARSE:=1 |
| 201 |
+ USE_SYSTEM_LIBUV:=0 |
| 202 |
+ USE_SYSTEM_UTF8PROC:=1 |
| 203 |
+ USE_SYSTEM_MBEDTLS:=1 |
| 204 |
+ USE_SYSTEM_LIBSSH2:=1 |
| 205 |
+ USE_SYSTEM_NGHTTP2:=1 |
| 206 |
+ USE_SYSTEM_CURL:=1 |
| 207 |
+ USE_SYSTEM_LIBGIT2:=1 |
| 208 |
+ USE_SYSTEM_PATCHELF:=1 |
| 209 |
+ USE_SYSTEM_ZLIB:=1 |
| 210 |
+ USE_SYSTEM_P7ZIP:=1 |
| 211 |
+ VERBOSE:=1 |
| 212 |
+ EOF |
| 213 |
+} |
| 214 |
+ |
| 215 |
+src_compile() { |
| 216 |
+ # Julia accesses /proc/self/mem on Linux |
| 217 |
+ addpredict /proc/self/mem |
| 218 |
+ |
| 219 |
+ default |
| 220 |
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" |
| 221 |
+} |
| 222 |
+ |
| 223 |
+src_install() { |
| 224 |
+ emake install DESTDIR="${D}" |
| 225 |
+ |
| 226 |
+ if ! use system-llvm ; then |
| 227 |
+ local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) |
| 228 |
+ cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die |
| 229 |
+ fi |
| 230 |
+ |
| 231 |
+ dodoc README.md |
| 232 |
+ |
| 233 |
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die |
| 234 |
+ rmdir "${ED}"/usr/etc || die |
| 235 |
+ mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die |
| 236 |
+ rmdir "${ED}"/usr/share/doc/julia || die |
| 237 |
+ |
| 238 |
+ # The appdata directory is deprecated. |
| 239 |
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die |
| 240 |
+} |
| 241 |
+ |
| 242 |
+pkg_postinst() { |
| 243 |
+ elog "To use Plots, you will need to install sci-visualization/gr." |
| 244 |
+} |
Archives