1 |
commit: 8e43531d99afe3de55af083f17f930b275ecbefe |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 5 10:47:01 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=8e43531d |
7 |
|
8 |
dev-lang/julia: remove old versions and patches |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
12 |
|
13 |
dev-lang/julia/Manifest | 1 - |
14 |
.../julia/files/julia-1.1.0-fix_build_system.patch | 53 ---- |
15 |
.../julia/files/julia-1.6.0-fix-system-csl.patch | 271 --------------------- |
16 |
.../julia/files/julia-1.7.0-do_not_set_rpath.patch | 29 --- |
17 |
dev-lang/julia/julia-1.7.0.ebuild | 179 -------------- |
18 |
dev-lang/julia/julia-1.7.1-r1.ebuild | 178 -------------- |
19 |
dev-lang/julia/julia-1.7.1-r2.ebuild | 1 - |
20 |
7 files changed, 712 deletions(-) |
21 |
|
22 |
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest |
23 |
index 97dcc962e7b7..12e16a297558 100644 |
24 |
--- a/dev-lang/julia/Manifest |
25 |
+++ b/dev-lang/julia/Manifest |
26 |
@@ -1,6 +1,5 @@ |
27 |
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de |
28 |
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc |
29 |
-DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce |
30 |
DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f |
31 |
DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 |
32 |
DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c |
33 |
|
34 |
diff --git a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch |
35 |
deleted file mode 100644 |
36 |
index 394f5900a90e..000000000000 |
37 |
--- a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch |
38 |
+++ /dev/null |
39 |
@@ -1,53 +0,0 @@ |
40 |
-diff --git a/Make.inc b/Make.inc |
41 |
-index 81ff923..79e47f1 100644 |
42 |
---- a/Make.inc |
43 |
-+++ b/Make.inc |
44 |
-@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1 |
45 |
- # Directories where said libraries get installed to |
46 |
- prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) |
47 |
- bindir := $(prefix)/bin |
48 |
--libdir := $(prefix)/lib |
49 |
-+libdir := $(prefix)/GENTOOLIBDIR |
50 |
- libexecdir := $(prefix)/libexec |
51 |
- datarootdir := $(prefix)/share |
52 |
- docdir := $(datarootdir)/doc/julia |
53 |
-@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT) |
54 |
- JCXXFLAGS += -pedantic |
55 |
- endif |
56 |
- DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all |
57 |
--SHIPFLAGS := -O3 -ggdb2 -falign-functions |
58 |
-+SHIPFLAGS := GENTOOCFLAGS |
59 |
- endif |
60 |
- |
61 |
- ifeq ($(USECLANG),1) |
62 |
-@@ -428,7 +428,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
63 |
- JCPPFLAGS := -fasynchronous-unwind-tables |
64 |
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic |
65 |
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
66 |
--SHIPFLAGS := -O3 -g |
67 |
-+SHIPFLAGS := GENTOOCFLAGS |
68 |
- ifeq ($(OS), Darwin) |
69 |
- ifeq ($(USE_LIBCPP), 1) |
70 |
- MACOSX_VERSION_MIN := 10.8 |
71 |
-@@ -457,7 +457,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
72 |
- JCPPFLAGS := |
73 |
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti |
74 |
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
75 |
--SHIPFLAGS := -O3 -g -falign-functions |
76 |
-+SHIPFLAGS := GENTOOCFLAGS |
77 |
- endif |
78 |
- |
79 |
- ifeq ($(USECCACHE), 1) |
80 |
-diff --git a/doc/Makefile b/doc/Makefile |
81 |
-index 99e60ee..2027fb5 100644 |
82 |
---- a/doc/Makefile |
83 |
-+++ b/doc/Makefile |
84 |
-@@ -30,7 +30,7 @@ deps: UnicodeData.txt |
85 |
- $(JLCHECKSUM) UnicodeData.txt |
86 |
- |
87 |
- clean: |
88 |
-- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt |
89 |
-+ @echo "Do not clean doc/_build/html. Just use it..." |
90 |
- |
91 |
- cleanall: clean |
92 |
- |
93 |
|
94 |
diff --git a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch |
95 |
deleted file mode 100644 |
96 |
index 90a097197bff..000000000000 |
97 |
--- a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch |
98 |
+++ /dev/null |
99 |
@@ -1,271 +0,0 @@ |
100 |
-From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001 |
101 |
-From: Elliot Saba <staticfloat@×××××.com> |
102 |
-Date: Fri, 26 Mar 2021 18:40:07 +0000 |
103 |
-Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL |
104 |
- |
105 |
-We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration |
106 |
-(where we copy the CSL libraries into the Julia build tree) versus a |
107 |
-`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner |
108 |
-similar to other system libararies) |
109 |
---- |
110 |
- Make.inc | 23 +++++++++++++- |
111 |
- base/Makefile | 88 ++++++++++++++++++++++++++++++--------------------- |
112 |
- deps/csl.mk | 40 ++++++++--------------- |
113 |
- 3 files changed, 87 insertions(+), 64 deletions(-) |
114 |
- |
115 |
-diff --git a/Make.inc b/Make.inc |
116 |
-index 519720a861ed7..7cba05806e684 100644 |
117 |
---- a/Make.inc |
118 |
-+++ b/Make.inc |
119 |
-@@ -596,6 +596,21 @@ else |
120 |
- SHLIB_EXT := so |
121 |
- endif |
122 |
- |
123 |
-+ifeq ($(OS),WINNT) |
124 |
-+define versioned_libname |
125 |
-+$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT)) |
126 |
-+endef |
127 |
-+else ifeq ($(OS),Darwin) |
128 |
-+define versioned_libname |
129 |
-+$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT)) |
130 |
-+endef |
131 |
-+else |
132 |
-+define versioned_libname |
133 |
-+$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT)) |
134 |
-+endef |
135 |
-+endif |
136 |
-+ |
137 |
-+ |
138 |
- ifeq ($(SHLIB_EXT), so) |
139 |
- define SONAME_FLAGS |
140 |
- -Wl,-soname=$1 |
141 |
-@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE |
142 |
- BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))) |
143 |
- BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))) |
144 |
- |
145 |
-+LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN)))) |
146 |
-+ |
147 |
- # This is the set of projects that BinaryBuilder dependencies are hooked up for. |
148 |
- BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL |
149 |
- define SET_BB_DEFAULT |
150 |
-@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),) |
151 |
- LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1 |
152 |
- endif |
153 |
- |
154 |
-- |
155 |
-+# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir |
156 |
-+ifeq ($(USE_SYSTEM_CSL),1) |
157 |
-+LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME)) |
158 |
-+else |
159 |
- LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME)) |
160 |
-+endif |
161 |
- LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME)) |
162 |
- |
163 |
- # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir |
164 |
-diff --git a/base/Makefile b/base/Makefile |
165 |
-index e024e546f94d3..2bef6aab7f1f4 100644 |
166 |
---- a/base/Makefile |
167 |
-+++ b/base/Makefile |
168 |
-@@ -169,53 +169,69 @@ endif |
169 |
- # echo "$$P" |
170 |
- |
171 |
- define symlink_system_library |
172 |
--symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT) |
173 |
--$$(build_private_libdir)/$1.$$(SHLIB_EXT): |
174 |
-- REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \ |
175 |
-- $$(call resolve_path,REALPATH) && \ |
176 |
-- [ -e "$$$$REALPATH" ] && \ |
177 |
-- ([ ! -e "$$@" ] || rm "$$@") && \ |
178 |
-- echo ln -sf "$$$$REALPATH" "$$@" && \ |
179 |
-- ln -sf "$$$$REALPATH" "$$@" |
180 |
--ifneq ($2,) |
181 |
--ifneq ($$(USE_SYSTEM_$2),0) |
182 |
--SYMLINK_SYSTEM_LIBRARIES += symlink_$1 |
183 |
--endif |
184 |
-+libname_$2 := $$(notdir $(call versioned_libname,$2,$3)) |
185 |
-+libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null) |
186 |
-+symlink_$2: $$(build_private_libdir)/$$(libname_$2) |
187 |
-+$$(build_private_libdir)/$$(libname_$2): |
188 |
-+ @if [ -e "$$(libpath_$2)" ]; then \ |
189 |
-+ REALPATH=$$(libpath_$2); \ |
190 |
-+ $$(call resolve_path,REALPATH) && \ |
191 |
-+ [ -e "$$$$REALPATH" ] && \ |
192 |
-+ ([ ! -e "$$@" ] || rm "$$@") && \ |
193 |
-+ echo ln -sf "$$$$REALPATH" "$$@" && \ |
194 |
-+ ln -sf "$$$$REALPATH" "$$@"; \ |
195 |
-+ else \ |
196 |
-+ if [ "$4" != "ALLOW_FAILURE" ]; then \ |
197 |
-+ echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \ |
198 |
-+ false; \ |
199 |
-+ fi; \ |
200 |
-+ fi |
201 |
-+ifneq ($$(USE_SYSTEM_$1),0) |
202 |
-+SYMLINK_SYSTEM_LIBRARIES += symlink_$2 |
203 |
- endif |
204 |
- endef |
205 |
- |
206 |
- # the following excludes: libuv.a, libutf8proc.a |
207 |
- |
208 |
--$(eval $(call symlink_system_library,$(LIBMNAME))) |
209 |
- ifneq ($(USE_SYSTEM_LIBM),0) |
210 |
--SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME) |
211 |
-+$(eval $(call symlink_system_library,LIBM,$(LIBMNAME))) |
212 |
- else ifneq ($(USE_SYSTEM_OPENLIBM),0) |
213 |
--SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME) |
214 |
-+$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME))) |
215 |
- endif |
216 |
- |
217 |
--$(eval $(call symlink_system_library,libpcre2-8,PCRE)) |
218 |
--$(eval $(call symlink_system_library,libdSFMT,DSFMT)) |
219 |
--$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS)) |
220 |
-+$(eval $(call symlink_system_library,CSL,libgcc_s,1)) |
221 |
-+ifneq (,$(LIBGFORTRAN_VERSION)) |
222 |
-+$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION))) |
223 |
-+endif |
224 |
-+$(eval $(call symlink_system_library,CSL,libquadmath,0)) |
225 |
-+$(eval $(call symlink_system_library,CSL,libstdc++,6)) |
226 |
-+# We allow libssp, libatomic and libgomp to fail as they are not available on all systems |
227 |
-+$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE)) |
228 |
-+$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE)) |
229 |
-+$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE)) |
230 |
-+$(eval $(call symlink_system_library,PCRE,libpcre2-8)) |
231 |
-+$(eval $(call symlink_system_library,DSFMT,libdSFMT)) |
232 |
-+$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME))) |
233 |
- ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME)) |
234 |
--$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK)) |
235 |
-+$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME))) |
236 |
- endif |
237 |
--$(eval $(call symlink_system_library,libgmp,GMP)) |
238 |
--$(eval $(call symlink_system_library,libmpfr,MPFR)) |
239 |
--$(eval $(call symlink_system_library,libmbedtls,MBEDTLS)) |
240 |
--$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS)) |
241 |
--$(eval $(call symlink_system_library,libmbedx509,MBEDTLS)) |
242 |
--$(eval $(call symlink_system_library,libssh2,LIBSSH2)) |
243 |
--$(eval $(call symlink_system_library,libnghttp2,NGHTTP2)) |
244 |
--$(eval $(call symlink_system_library,libcurl,CURL)) |
245 |
--$(eval $(call symlink_system_library,libgit2,LIBGIT2)) |
246 |
--$(eval $(call symlink_system_library,libamd,SUITESPARSE)) |
247 |
--$(eval $(call symlink_system_library,libcamd,SUITESPARSE)) |
248 |
--$(eval $(call symlink_system_library,libccolamd,SUITESPARSE)) |
249 |
--$(eval $(call symlink_system_library,libcholmod,SUITESPARSE)) |
250 |
--$(eval $(call symlink_system_library,libcolamd,SUITESPARSE)) |
251 |
--$(eval $(call symlink_system_library,libumfpack,SUITESPARSE)) |
252 |
--$(eval $(call symlink_system_library,libspqr,SUITESPARSE)) |
253 |
--$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE)) |
254 |
-+$(eval $(call symlink_system_library,GMP,libgmp)) |
255 |
-+$(eval $(call symlink_system_library,MPFR,libmpfr)) |
256 |
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedtls)) |
257 |
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto)) |
258 |
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedx509)) |
259 |
-+$(eval $(call symlink_system_library,LIBSSH2,libssh2)) |
260 |
-+$(eval $(call symlink_system_library,NGHTTP2,libnghttp2)) |
261 |
-+$(eval $(call symlink_system_library,CURL,libcurl)) |
262 |
-+$(eval $(call symlink_system_library,LIBGIT2,libgit2)) |
263 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libamd)) |
264 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libcamd)) |
265 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libccolamd)) |
266 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libcholmod)) |
267 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libcolamd)) |
268 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libumfpack)) |
269 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libspqr)) |
270 |
-+$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig)) |
271 |
- # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen): |
272 |
- # libunwind |
273 |
- endif # WINNT |
274 |
-diff --git a/deps/csl.mk b/deps/csl.mk |
275 |
-index 095d4ceec4a1e..423201cbb5a0c 100644 |
276 |
---- a/deps/csl.mk |
277 |
-+++ b/deps/csl.mk |
278 |
-@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir) |
279 |
- [ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir) |
280 |
- endef |
281 |
- |
282 |
--ifeq ($(OS),WINNT) |
283 |
--define gen_libname |
284 |
--$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT)) |
285 |
--endef |
286 |
--else ifeq ($(OS),Darwin) |
287 |
--define gen_libname |
288 |
--$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT)) |
289 |
--endef |
290 |
--else |
291 |
--define gen_libname |
292 |
--$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT)) |
293 |
--endef |
294 |
--endif |
295 |
-- |
296 |
- # libgfortran has multiple names; we're just going to copy any version we can find |
297 |
- # Since we're only looking in the location given by `$(FC)` this should only succeed for one. |
298 |
--$(eval $(call copy_csl,$(call gen_libname,gfortran,3))) |
299 |
--$(eval $(call copy_csl,$(call gen_libname,gfortran,4))) |
300 |
--$(eval $(call copy_csl,$(call gen_libname,gfortran,5))) |
301 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3))) |
302 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4))) |
303 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5))) |
304 |
- |
305 |
- # These are all libraries that we should always have |
306 |
--$(eval $(call copy_csl,$(call gen_libname,quadmath,0))) |
307 |
--$(eval $(call copy_csl,$(call gen_libname,stdc++,6))) |
308 |
--$(eval $(call copy_csl,$(call gen_libname,ssp,0))) |
309 |
--$(eval $(call copy_csl,$(call gen_libname,atomic,1))) |
310 |
--$(eval $(call copy_csl,$(call gen_libname,gomp,1))) |
311 |
-+$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0))) |
312 |
-+$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6))) |
313 |
-+$(eval $(call copy_csl,$(call versioned_libname,libssp,0))) |
314 |
-+$(eval $(call copy_csl,$(call versioned_libname,libatomic,1))) |
315 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgomp,1))) |
316 |
- |
317 |
- ifeq ($(OS),WINNT) |
318 |
- # Windwos has special gcc_s names |
319 |
- ifeq ($(ARCH),i686) |
320 |
--$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1))) |
321 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1))) |
322 |
- else |
323 |
--$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1))) |
324 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1))) |
325 |
- endif |
326 |
- else |
327 |
--$(eval $(call copy_csl,$(call gen_libname,gcc_s,1))) |
328 |
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1))) |
329 |
- endif |
330 |
- # winpthread is only Windows, pthread is only others |
331 |
- ifeq ($(OS),WINNT) |
332 |
--$(eval $(call copy_csl,$(call gen_libname,winpthread,1))) |
333 |
-+$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1))) |
334 |
- else |
335 |
--$(eval $(call copy_csl,$(call gen_libname,pthread,0))) |
336 |
-+$(eval $(call copy_csl,$(call versioned_libname,libpthread,0))) |
337 |
- endif |
338 |
- |
339 |
- get-csl: |
340 |
- |
341 |
-From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001 |
342 |
-From: Elliot Saba <staticfloat@×××××.com> |
343 |
-Date: Fri, 26 Mar 2021 22:32:04 +0000 |
344 |
-Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as |
345 |
- well |
346 |
- |
347 |
-Without this, we fail to install things like `libgcc_s.so.1` when |
348 |
-installed into the private libdir by `symlink_system_libraries`. |
349 |
---- |
350 |
- Makefile | 7 +++++-- |
351 |
- 1 file changed, 5 insertions(+), 2 deletions(-) |
352 |
- |
353 |
-diff --git a/Makefile b/Makefile |
354 |
-index 823ff3b86339d..e08f0e959e1b3 100644 |
355 |
---- a/Makefile |
356 |
-+++ b/Makefile |
357 |
-@@ -290,8 +290,11 @@ endif |
358 |
- done \ |
359 |
- done |
360 |
- for suffix in $(JL_PRIVATE_LIBS-1) ; do \ |
361 |
-- lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \ |
362 |
-- $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \ |
363 |
-+ for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \ |
364 |
-+ if [ "$${lib##*.}" != "dSYM" ]; then \ |
365 |
-+ $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \ |
366 |
-+ fi \ |
367 |
-+ done \ |
368 |
- done |
369 |
- endif |
370 |
- # Install `7z` into libexec/ |
371 |
|
372 |
diff --git a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch |
373 |
deleted file mode 100644 |
374 |
index 24f12d261053..000000000000 |
375 |
--- a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch |
376 |
+++ /dev/null |
377 |
@@ -1,29 +0,0 @@ |
378 |
---- a/Makefile 2021-12-21 09:38:26.782829864 +0100 |
379 |
-+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 |
380 |
-@@ -336,7 +336,7 @@ |
381 |
- install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \ |
382 |
- done |
383 |
- endif |
384 |
--else ifneq (,$(findstring $(OS),Linux FreeBSD)) |
385 |
-+else ifneq (,$(findstring $(OS),FreeBSD)) |
386 |
- for j in $(JL_TARGETS) ; do \ |
387 |
- $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \ |
388 |
- done |
389 |
-@@ -357,7 +357,7 @@ |
390 |
- endif |
391 |
- |
392 |
- # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD |
393 |
--ifneq (,$(findstring $(OS),Linux FreeBSD)) |
394 |
-+ifneq (,$(findstring $(OS),FreeBSD)) |
395 |
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT) |
396 |
- ifeq ($(BUNDLE_DEBUG_LIBS),1) |
397 |
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT) |
398 |
-@@ -365,7 +365,7 @@ |
399 |
- endif |
400 |
- |
401 |
- # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD |
402 |
--ifneq (,$(findstring $(OS),Linux FreeBSD)) |
403 |
-+ifneq (,$(findstring $(OS),FreeBSD)) |
404 |
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) |
405 |
- endif |
406 |
- |
407 |
|
408 |
diff --git a/dev-lang/julia/julia-1.7.0.ebuild b/dev-lang/julia/julia-1.7.0.ebuild |
409 |
deleted file mode 100644 |
410 |
index 57c446a0e3ab..000000000000 |
411 |
--- a/dev-lang/julia/julia-1.7.0.ebuild |
412 |
+++ /dev/null |
413 |
@@ -1,179 +0,0 @@ |
414 |
-# Copyright 1999-2021 Gentoo Authors |
415 |
-# Distributed under the terms of the GNU General Public License v2 |
416 |
- |
417 |
-EAPI=7 |
418 |
- |
419 |
-inherit llvm pax-utils toolchain-funcs |
420 |
- |
421 |
-# correct versions for stdlibs are in deps/checksums |
422 |
-# for everything else, run with network-sandbox and wait for the crash |
423 |
- |
424 |
-MY_LLVM_V="13.0.1" |
425 |
- |
426 |
-DESCRIPTION="High-performance programming language for technical computing" |
427 |
-HOMEPAGE="https://julialang.org/" |
428 |
- |
429 |
-SRC_URI=" |
430 |
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz |
431 |
-" |
432 |
- |
433 |
-LICENSE="MIT" |
434 |
-SLOT="0" |
435 |
-KEYWORDS="~amd64 ~x86" |
436 |
-IUSE="+system-llvm" |
437 |
- |
438 |
-RDEPEND=" |
439 |
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) |
440 |
-" |
441 |
-LLVM_MAX_SLOT=13 |
442 |
- |
443 |
-RDEPEND+=" |
444 |
- app-arch/p7zip |
445 |
- dev-libs/gmp:0= |
446 |
- dev-libs/libgit2:0 |
447 |
- >=dev-libs/libpcre2-10.23:0=[jit,unicode] |
448 |
- dev-libs/mpfr:0= |
449 |
- dev-libs/libutf8proc:0=[-cjk] |
450 |
- dev-util/patchelf |
451 |
- >=net-libs/mbedtls-2.2 |
452 |
- net-misc/curl[http2,ssh] |
453 |
- sci-libs/amd:0= |
454 |
- sci-libs/arpack:0= |
455 |
- sci-libs/camd:0= |
456 |
- sci-libs/ccolamd:0= |
457 |
- sci-libs/cholmod:0= |
458 |
- sci-libs/colamd:0= |
459 |
- sci-libs/fftw:3.0=[threads] |
460 |
- sci-libs/openlibm:0= |
461 |
- sci-libs/spqr:0= |
462 |
- sci-libs/umfpack:0= |
463 |
- >=sci-mathematics/dsfmt-2.2.4 |
464 |
- >=sys-libs/libunwind-1.1:0= |
465 |
- sys-libs/zlib:0= |
466 |
- >=virtual/blas-3.6 |
467 |
- virtual/lapack" |
468 |
- |
469 |
-DEPEND="${RDEPEND} |
470 |
- dev-util/patchelf |
471 |
- virtual/pkgconfig |
472 |
- !system-llvm? ( dev-util/cmake )" |
473 |
- |
474 |
-PATCHES=( |
475 |
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch |
476 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch |
477 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch |
478 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch |
479 |
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch |
480 |
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch |
481 |
- "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch |
482 |
- "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch |
483 |
-) |
484 |
- # just remove patchelf from linux ?? just my own solution to sigsegv error ?? |
485 |
- #"${FILESDIR}/${PN}"-turnoff-patchelf.patch |
486 |
- |
487 |
-pkg_setup() { |
488 |
- use system-llvm && llvm_pkg_setup |
489 |
-} |
490 |
- |
491 |
-src_unpack() { |
492 |
- local tounpack=(${A}) |
493 |
- # the main source tree, followed by deps |
494 |
- unpack "${tounpack[0]}" |
495 |
- |
496 |
- mkdir -p "${S}/deps/srccache/" |
497 |
- for i in "${tounpack[@]:1}"; do |
498 |
- cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die |
499 |
- done |
500 |
-} |
501 |
- |
502 |
-src_prepare() { |
503 |
- default |
504 |
- |
505 |
- # Sledgehammer: |
506 |
- # - prevent fetching of bundled stuff in compile and install phase |
507 |
- # - respect CFLAGS |
508 |
- # - respect EPREFIX and Gentoo specific paths |
509 |
- |
510 |
- sed -i \ |
511 |
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ |
512 |
- Make.inc || die |
513 |
- |
514 |
- sed -i \ |
515 |
- -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ |
516 |
- src/Makefile || die |
517 |
- |
518 |
- # disable doc install starting git fetching |
519 |
- sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die |
520 |
-} |
521 |
- |
522 |
-src_configure() { |
523 |
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." |
524 |
- |
525 |
- # julia does not play well with the system versions of libuv |
526 |
- # USE_SYSTEM_LIBM=0 implies using external openlibm |
527 |
- cat <<-EOF > Make.user |
528 |
- LOCALBASE:="${EPREFIX}/usr" |
529 |
- override prefix:="${EPREFIX}/usr" |
530 |
- override libdir:="\$(prefix)/$(get_libdir)" |
531 |
- override CC:=$(tc-getCC) |
532 |
- override CXX:=$(tc-getCXX) |
533 |
- override AR:=$(tc-getAR) |
534 |
- |
535 |
- BUNDLE_DEBUG_LIBS:=0 |
536 |
- USE_BINARYBUILDER:=0 |
537 |
- USE_SYSTEM_CSL:=1 |
538 |
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) |
539 |
- USE_SYSTEM_LIBUNWIND:=1 |
540 |
- USE_SYSTEM_PCRE:=1 |
541 |
- USE_SYSTEM_LIBM:=0 |
542 |
- USE_SYSTEM_OPENLIBM:=1 |
543 |
- USE_SYSTEM_DSFMT:=1 |
544 |
- USE_SYSTEM_BLAS:=1 |
545 |
- USE_SYSTEM_LAPACK:=1 |
546 |
- USE_SYSTEM_GMP:=1 |
547 |
- USE_SYSTEM_MPFR:=1 |
548 |
- USE_SYSTEM_SUITESPARSE:=1 |
549 |
- USE_SYSTEM_LIBUV:=0 |
550 |
- USE_SYSTEM_UTF8PROC:=1 |
551 |
- USE_SYSTEM_MBEDTLS:=1 |
552 |
- USE_SYSTEM_LIBSSH2:=1 |
553 |
- USE_SYSTEM_NGHTTP2:=1 |
554 |
- USE_SYSTEM_CURL:=1 |
555 |
- USE_SYSTEM_LIBGIT2:=1 |
556 |
- USE_SYSTEM_PATCHELF:=1 |
557 |
- USE_SYSTEM_ZLIB:=1 |
558 |
- USE_SYSTEM_P7ZIP:=1 |
559 |
- VERBOSE:=1 |
560 |
- EOF |
561 |
-} |
562 |
- |
563 |
-src_compile() { |
564 |
- # Julia accesses /proc/self/mem on Linux |
565 |
- addpredict /proc/self/mem |
566 |
- |
567 |
- default |
568 |
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" |
569 |
-} |
570 |
- |
571 |
-src_install() { |
572 |
- emake install DESTDIR="${D}" |
573 |
- |
574 |
- if ! use system-llvm ; then |
575 |
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) |
576 |
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die |
577 |
- fi |
578 |
- |
579 |
- dodoc README.md |
580 |
- |
581 |
- mv "${ED}"/usr/etc/julia "${ED}"/etc || die |
582 |
- rmdir "${ED}"/usr/etc || die |
583 |
- mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die |
584 |
- rmdir "${ED}"/usr/share/doc/julia || die |
585 |
- |
586 |
- # The appdata directory is deprecated. |
587 |
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die |
588 |
-} |
589 |
- |
590 |
-pkg_postinst() { |
591 |
- elog "To use Plots, you will need to install sci-visualization/gr." |
592 |
-} |
593 |
|
594 |
diff --git a/dev-lang/julia/julia-1.7.1-r1.ebuild b/dev-lang/julia/julia-1.7.1-r1.ebuild |
595 |
deleted file mode 100644 |
596 |
index 0277fb0ae72b..000000000000 |
597 |
--- a/dev-lang/julia/julia-1.7.1-r1.ebuild |
598 |
+++ /dev/null |
599 |
@@ -1,178 +0,0 @@ |
600 |
-# Copyright 1999-2022 Gentoo Authors |
601 |
-# Distributed under the terms of the GNU General Public License v2 |
602 |
- |
603 |
-EAPI=7 |
604 |
- |
605 |
-inherit llvm pax-utils toolchain-funcs |
606 |
- |
607 |
-# correct versions for stdlibs are in deps/checksums |
608 |
-# for everything else, run with network-sandbox and wait for the crash |
609 |
- |
610 |
-MY_LLVM_V="13.0.0" |
611 |
- |
612 |
-DESCRIPTION="High-performance programming language for technical computing" |
613 |
-HOMEPAGE="https://julialang.org/" |
614 |
- |
615 |
-SRC_URI=" |
616 |
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz |
617 |
-" |
618 |
- |
619 |
-LICENSE="MIT" |
620 |
-SLOT="0" |
621 |
-KEYWORDS="~amd64 ~x86" |
622 |
-IUSE="+system-llvm" |
623 |
- |
624 |
-RDEPEND=" |
625 |
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) |
626 |
-" |
627 |
-LLVM_MAX_SLOT=13 |
628 |
- |
629 |
-RDEPEND+=" |
630 |
- app-arch/p7zip |
631 |
- dev-libs/gmp:0= |
632 |
- dev-libs/libgit2:0 |
633 |
- >=dev-libs/libpcre2-10.23:0=[jit,unicode] |
634 |
- dev-libs/mpfr:0= |
635 |
- >=dev-libs/libutf8proc-2.6.1:0=[-cjk] |
636 |
- >=dev-util/patchelf-0.13 |
637 |
- >=net-libs/mbedtls-2.2 |
638 |
- net-misc/curl[http2,ssh] |
639 |
- sci-libs/amd:0= |
640 |
- sci-libs/arpack:0= |
641 |
- sci-libs/camd:0= |
642 |
- sci-libs/ccolamd:0= |
643 |
- sci-libs/cholmod:0= |
644 |
- sci-libs/colamd:0= |
645 |
- sci-libs/fftw:3.0=[threads] |
646 |
- sci-libs/openlibm:0= |
647 |
- sci-libs/spqr:0= |
648 |
- sci-libs/umfpack:0= |
649 |
- >=sci-mathematics/dsfmt-2.2.4 |
650 |
- >=sys-libs/libunwind-1.1:0= |
651 |
- sys-libs/zlib:0= |
652 |
- >=virtual/blas-3.6 |
653 |
- virtual/lapack" |
654 |
- |
655 |
-DEPEND="${RDEPEND} |
656 |
- dev-util/patchelf |
657 |
- virtual/pkgconfig |
658 |
- !system-llvm? ( dev-util/cmake )" |
659 |
- |
660 |
-PATCHES=( |
661 |
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch |
662 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch |
663 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch |
664 |
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch |
665 |
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch |
666 |
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch |
667 |
- "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch |
668 |
- "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch |
669 |
-) |
670 |
- |
671 |
-pkg_setup() { |
672 |
- use system-llvm && llvm_pkg_setup |
673 |
-} |
674 |
- |
675 |
-src_unpack() { |
676 |
- local tounpack=(${A}) |
677 |
- # the main source tree, followed by deps |
678 |
- unpack "${tounpack[0]}" |
679 |
- |
680 |
- mkdir -p "${S}/deps/srccache/" |
681 |
- for i in "${tounpack[@]:1}"; do |
682 |
- cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die |
683 |
- done |
684 |
-} |
685 |
- |
686 |
-src_prepare() { |
687 |
- default |
688 |
- |
689 |
- # Sledgehammer: |
690 |
- # - prevent fetching of bundled stuff in compile and install phase |
691 |
- # - respect CFLAGS |
692 |
- # - respect EPREFIX and Gentoo specific paths |
693 |
- |
694 |
- sed -i \ |
695 |
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ |
696 |
- Make.inc || die |
697 |
- |
698 |
- sed -i \ |
699 |
- -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ |
700 |
- src/Makefile || die |
701 |
- |
702 |
- # disable doc install starting git fetching |
703 |
- sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die |
704 |
-} |
705 |
- |
706 |
-src_configure() { |
707 |
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." |
708 |
- |
709 |
- # julia does not play well with the system versions of libuv |
710 |
- # USE_SYSTEM_LIBM=0 implies using external openlibm |
711 |
- cat <<-EOF > Make.user |
712 |
- LOCALBASE:="${EPREFIX}/usr" |
713 |
- override prefix:="${EPREFIX}/usr" |
714 |
- override libdir:="\$(prefix)/$(get_libdir)" |
715 |
- override CC:=$(tc-getCC) |
716 |
- override CXX:=$(tc-getCXX) |
717 |
- override AR:=$(tc-getAR) |
718 |
- |
719 |
- BUNDLE_DEBUG_LIBS:=0 |
720 |
- USE_BINARYBUILDER:=0 |
721 |
- USE_SYSTEM_CSL:=1 |
722 |
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) |
723 |
- USE_SYSTEM_LIBUNWIND:=1 |
724 |
- USE_SYSTEM_PCRE:=1 |
725 |
- USE_SYSTEM_LIBM:=0 |
726 |
- USE_SYSTEM_OPENLIBM:=1 |
727 |
- USE_SYSTEM_DSFMT:=1 |
728 |
- USE_SYSTEM_BLAS:=1 |
729 |
- USE_SYSTEM_LAPACK:=1 |
730 |
- USE_SYSTEM_LIBBLASTRAMPOLINE:=0 |
731 |
- USE_SYSTEM_GMP:=1 |
732 |
- USE_SYSTEM_MPFR:=1 |
733 |
- USE_SYSTEM_LIBSUITESPARSE:=1 |
734 |
- USE_SYSTEM_LIBUV:=0 |
735 |
- USE_SYSTEM_UTF8PROC:=1 |
736 |
- USE_SYSTEM_MBEDTLS:=1 |
737 |
- USE_SYSTEM_LIBSSH2:=1 |
738 |
- USE_SYSTEM_NGHTTP2:=1 |
739 |
- USE_SYSTEM_CURL:=1 |
740 |
- USE_SYSTEM_LIBGIT2:=1 |
741 |
- USE_SYSTEM_PATCHELF:=1 |
742 |
- USE_SYSTEM_ZLIB:=1 |
743 |
- USE_SYSTEM_P7ZIP:=1 |
744 |
- VERBOSE:=1 |
745 |
- EOF |
746 |
-} |
747 |
- |
748 |
-src_compile() { |
749 |
- # Julia accesses /proc/self/mem on Linux |
750 |
- addpredict /proc/self/mem |
751 |
- |
752 |
- default |
753 |
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" |
754 |
-} |
755 |
- |
756 |
-src_install() { |
757 |
- emake install DESTDIR="${D}" |
758 |
- |
759 |
- if ! use system-llvm ; then |
760 |
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) |
761 |
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die |
762 |
- fi |
763 |
- |
764 |
- dodoc README.md |
765 |
- |
766 |
- mv "${ED}"/usr/etc/julia "${ED}"/etc || die |
767 |
- rmdir "${ED}"/usr/etc || die |
768 |
- mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die |
769 |
- rmdir "${ED}"/usr/share/doc/julia || die |
770 |
- |
771 |
- # The appdata directory is deprecated. |
772 |
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die |
773 |
-} |
774 |
- |
775 |
-pkg_postinst() { |
776 |
- elog "To use Plots, you will need to install sci-visualization/gr." |
777 |
-} |
778 |
|
779 |
diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild |
780 |
index 50c67b8c1e00..a66329f48d64 100644 |
781 |
--- a/dev-lang/julia/julia-1.7.1-r2.ebuild |
782 |
+++ b/dev-lang/julia/julia-1.7.1-r2.ebuild |
783 |
@@ -57,7 +57,6 @@ RDEPEND+=" |
784 |
virtual/lapack" |
785 |
|
786 |
DEPEND="${RDEPEND} |
787 |
- dev-util/patchelf |
788 |
virtual/pkgconfig |
789 |
!system-llvm? ( dev-util/cmake )" |