| 1 |
commit: 5f93ba7b799fe4eaeb61cb315afe29595470382a |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 7 20:32:43 2019 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 7 21:35:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f93ba7b |
| 7 |
|
| 8 |
dev-lang/julia: drop old version 1.0.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/julia/Manifest | 1 - |
| 14 |
.../julia/files/julia-1.0.0-fix_build_system.patch | 86 --------- |
| 15 |
dev-lang/julia/julia-1.0.1.ebuild | 201 --------------------- |
| 16 |
3 files changed, 288 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest |
| 19 |
index b0c5dfe9bbf..860188c463e 100644 |
| 20 |
--- a/dev-lang/julia/Manifest |
| 21 |
+++ b/dev-lang/julia/Manifest |
| 22 |
@@ -1,7 +1,6 @@ |
| 23 |
DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d |
| 24 |
DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8 |
| 25 |
DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804 |
| 26 |
-DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18 |
| 27 |
DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d |
| 28 |
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662 |
| 29 |
DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e |
| 30 |
|
| 31 |
diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 028a2f7e08c..00000000000 |
| 34 |
--- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,86 +0,0 @@ |
| 37 |
-diff --git a/Make.inc b/Make.inc |
| 38 |
-index 8cb2c1014..d3be9de8e 100644 |
| 39 |
---- a/Make.inc |
| 40 |
-+++ b/Make.inc |
| 41 |
-@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1 |
| 42 |
- # Directories where said libraries get installed to |
| 43 |
- prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) |
| 44 |
- bindir := $(prefix)/bin |
| 45 |
--libdir := $(prefix)/lib |
| 46 |
-+libdir := $(prefix)/GENTOOLIBDIR |
| 47 |
- libexecdir := $(prefix)/libexec |
| 48 |
- datarootdir := $(prefix)/share |
| 49 |
- docdir := $(datarootdir)/doc/julia |
| 50 |
-@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT) |
| 51 |
- JCXXFLAGS += -pedantic |
| 52 |
- endif |
| 53 |
- DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all |
| 54 |
--SHIPFLAGS := -O3 -ggdb2 -falign-functions |
| 55 |
-+SHIPFLAGS := GENTOOCFLAGS |
| 56 |
- endif |
| 57 |
- |
| 58 |
- ifeq ($(USECLANG),1) |
| 59 |
-@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
| 60 |
- JCPPFLAGS := -fasynchronous-unwind-tables |
| 61 |
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic |
| 62 |
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
| 63 |
--SHIPFLAGS := -O3 -g |
| 64 |
-+SHIPFLAGS := GENTOOCFLAGS |
| 65 |
- ifeq ($(OS), Darwin) |
| 66 |
- ifeq ($(USE_LIBCPP), 1) |
| 67 |
- MACOSX_VERSION_MIN := 10.8 |
| 68 |
-@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
| 69 |
- JCPPFLAGS := |
| 70 |
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti |
| 71 |
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
| 72 |
--SHIPFLAGS := -O3 -g -falign-functions |
| 73 |
-+SHIPFLAGS := GENTOOCFLAGS |
| 74 |
- endif |
| 75 |
- |
| 76 |
- ifeq ($(USECCACHE), 1) |
| 77 |
-diff --git a/doc/Makefile b/doc/Makefile |
| 78 |
-index 89b79880d..c3125fde1 100644 |
| 79 |
---- a/doc/Makefile |
| 80 |
-+++ b/doc/Makefile |
| 81 |
-@@ -29,7 +29,7 @@ deps: UnicodeData.txt |
| 82 |
- $(JLCHECKSUM) UnicodeData.txt |
| 83 |
- |
| 84 |
- clean: |
| 85 |
-- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt |
| 86 |
-+ @echo "Do not clean doc/_build/html. Just use it..." |
| 87 |
- |
| 88 |
- cleanall: clean |
| 89 |
- |
| 90 |
-diff --git a/src/Makefile b/src/Makefile |
| 91 |
-index 257152d24..240a4a350 100644 |
| 92 |
---- a/src/Makefile |
| 93 |
-+++ b/src/Makefile |
| 94 |
-@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h |
| 95 |
- endif |
| 96 |
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) |
| 97 |
- |
| 98 |
--ifeq ($(JULIACODEGEN),LLVM) |
| 99 |
--# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs |
| 100 |
--# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. |
| 101 |
--ifneq ($(USE_LLVM_SHLIB),1) |
| 102 |
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) |
| 103 |
--else |
| 104 |
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM |
| 105 |
--FLAGS += -DLLVM_SHLIB |
| 106 |
--endif # USE_LLVM_SHLIB == 1 |
| 107 |
--endif |
| 108 |
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) |
| 109 |
- |
| 110 |
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) |
| 111 |
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) |
| 112 |
- |
| 113 |
---- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400 |
| 114 |
-+++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400 |
| 115 |
-@@ -207,7 +207,6 @@ |
| 116 |
- ln -sf "$$REALPATH" "$@" |
| 117 |
- ifneq ($(USE_SYSTEM_LLVM),0) |
| 118 |
- ifneq ($(USE_LLVM_SHLIB),0) |
| 119 |
--SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM |
| 120 |
- endif |
| 121 |
- endif |
| 122 |
- |
| 123 |
|
| 124 |
diff --git a/dev-lang/julia/julia-1.0.1.ebuild b/dev-lang/julia/julia-1.0.1.ebuild |
| 125 |
deleted file mode 100644 |
| 126 |
index 6f417285d13..00000000000 |
| 127 |
--- a/dev-lang/julia/julia-1.0.1.ebuild |
| 128 |
+++ /dev/null |
| 129 |
@@ -1,201 +0,0 @@ |
| 130 |
-# Copyright 1999-2018 Gentoo Authors |
| 131 |
-# Distributed under the terms of the GNU General Public License v2 |
| 132 |
- |
| 133 |
-EAPI=6 |
| 134 |
- |
| 135 |
-RESTRICT="test" |
| 136 |
- |
| 137 |
-inherit llvm pax-utils toolchain-funcs |
| 138 |
- |
| 139 |
-MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e" |
| 140 |
-MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6" |
| 141 |
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e" |
| 142 |
-MY_DSFMT_V="2.2.3" |
| 143 |
- |
| 144 |
-DESCRIPTION="High-performance programming language for technical computing" |
| 145 |
-HOMEPAGE="https://julialang.org/" |
| 146 |
-SRC_URI=" |
| 147 |
- https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz |
| 148 |
- https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz |
| 149 |
- https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz |
| 150 |
- https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz |
| 151 |
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz |
| 152 |
-" |
| 153 |
- |
| 154 |
-S="${WORKDIR}/${PN}" |
| 155 |
- |
| 156 |
-LICENSE="MIT" |
| 157 |
-SLOT="0" |
| 158 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 159 |
-IUSE="" |
| 160 |
- |
| 161 |
-# julia 0.7* needs a patched llvm-6 |
| 162 |
-RDEPEND=" |
| 163 |
- =sys-devel/llvm-6*:= |
| 164 |
- =sys-devel/clang-6*:=" |
| 165 |
-LLVM_MAX_SLOT=6 |
| 166 |
- |
| 167 |
-RDEPEND+=" |
| 168 |
- dev-libs/double-conversion:0= |
| 169 |
- dev-libs/gmp:0= |
| 170 |
- dev-libs/libgit2:0= |
| 171 |
- >=dev-libs/libpcre2-10.23:0=[jit] |
| 172 |
- dev-libs/mpfr:0= |
| 173 |
- dev-libs/openspecfun |
| 174 |
- sci-libs/amd:0= |
| 175 |
- sci-libs/arpack:0= |
| 176 |
- sci-libs/camd:0= |
| 177 |
- sci-libs/ccolamd:0= |
| 178 |
- sci-libs/cholmod:0= |
| 179 |
- sci-libs/colamd:0= |
| 180 |
- sci-libs/fftw:3.0=[threads] |
| 181 |
- sci-libs/openlibm:0= |
| 182 |
- sci-libs/spqr:0= |
| 183 |
- sci-libs/umfpack:0= |
| 184 |
- sci-mathematics/glpk:0= |
| 185 |
- >=sys-libs/libunwind-1.1:7= |
| 186 |
- sys-libs/readline:0= |
| 187 |
- sys-libs/zlib:0= |
| 188 |
- >=virtual/blas-3.6 |
| 189 |
- virtual/lapack" |
| 190 |
- |
| 191 |
-DEPEND="${RDEPEND} |
| 192 |
- dev-vcs/git |
| 193 |
- dev-util/patchelf |
| 194 |
- virtual/pkgconfig" |
| 195 |
- |
| 196 |
-PATCHES=( |
| 197 |
- "${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch |
| 198 |
-) |
| 199 |
- |
| 200 |
-src_unpack() { |
| 201 |
- tounpack=(${A}) |
| 202 |
- # the main source tree, followed by deps |
| 203 |
- unpack "${A/%\ */}" |
| 204 |
- |
| 205 |
- mkdir -p "${S}/deps/srccache/" |
| 206 |
- for i in "${tounpack[@]:1}"; do |
| 207 |
- cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die |
| 208 |
- done |
| 209 |
-} |
| 210 |
- |
| 211 |
-src_prepare() { |
| 212 |
- default |
| 213 |
- |
| 214 |
- # Sledgehammer: |
| 215 |
- # - prevent fetching of bundled stuff in compile and install phase |
| 216 |
- # - respect CFLAGS |
| 217 |
- # - respect EPREFIX and Gentoo specific paths |
| 218 |
- # - fix BLAS and LAPACK link interface |
| 219 |
- |
| 220 |
- sed -i \ |
| 221 |
- -e 's|git submodule|${EPREFIX}/bin/true|g' \ |
| 222 |
- -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ |
| 223 |
- -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ |
| 224 |
- deps/Makefile || die |
| 225 |
- |
| 226 |
- local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" |
| 227 |
- libblas="${libblas%% *}" |
| 228 |
- libblas="lib${libblas#-l}" |
| 229 |
- local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" |
| 230 |
- liblapack="${liblapack%% *}" |
| 231 |
- liblapack="lib${liblapack#-l}" |
| 232 |
- |
| 233 |
- sed -i \ |
| 234 |
- -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ |
| 235 |
- -e "s|GENTOOLIBDIR|$(get_libdir)|" \ |
| 236 |
- -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ |
| 237 |
- -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ |
| 238 |
- -e "s|= libblas|= ${libblas}|" \ |
| 239 |
- -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ |
| 240 |
- -e "s|= liblapack|= ${liblapack}|" \ |
| 241 |
- Make.inc || die |
| 242 |
- |
| 243 |
- sed -i \ |
| 244 |
- -e "s|,lib)|,$(get_libdir))|g" \ |
| 245 |
- -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ |
| 246 |
- Makefile || die |
| 247 |
- |
| 248 |
- sed -i \ |
| 249 |
- -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ |
| 250 |
- src/Makefile || die |
| 251 |
- |
| 252 |
- # disable doc install starting git fetching |
| 253 |
- sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die |
| 254 |
-} |
| 255 |
- |
| 256 |
-src_configure() { |
| 257 |
- # julia does not play well with the system versions of dsfmt, libuv, |
| 258 |
- # and utf8proc |
| 259 |
- |
| 260 |
- # USE_SYSTEM_LIBM=0 implies using external openlibm |
| 261 |
- cat <<-EOF > Make.user |
| 262 |
- USE_SYSTEM_ARPACK:=1 |
| 263 |
- USE_SYSTEM_BLAS:=1 |
| 264 |
- USE_SYSTEM_DSFMT:=0 |
| 265 |
- USE_SYSTEM_GMP:=1 |
| 266 |
- USE_SYSTEM_GRISU:=1 |
| 267 |
- USE_SYSTEM_LAPACK:=1 |
| 268 |
- USE_SYSTEM_LIBGIT2:=1 |
| 269 |
- USE_SYSTEM_LIBM:=0 |
| 270 |
- USE_SYSTEM_LIBUNWIND:=1 |
| 271 |
- USE_SYSTEM_LIBUV:=0 |
| 272 |
- USE_SYSTEM_LLVM:=1 |
| 273 |
- USE_LLVM_SHLIB:=1 |
| 274 |
- USE_SYSTEM_MPFR:=1 |
| 275 |
- USE_SYSTEM_OPENLIBM:=1 |
| 276 |
- USE_SYSTEM_OPENSPECFUN:=1 |
| 277 |
- USE_SYSTEM_PATCHELF:=1 |
| 278 |
- USE_SYSTEM_PCRE:=1 |
| 279 |
- USE_SYSTEM_READLINE:=1 |
| 280 |
- USE_SYSTEM_RMATH:=0 |
| 281 |
- USE_SYSTEM_SUITESPARSE:=1 |
| 282 |
- USE_SYSTEM_UTF8PROC:=0 |
| 283 |
- USE_SYSTEM_ZLIB=1 |
| 284 |
- VERBOSE=1 |
| 285 |
- libdir="${EROOT}/usr/$(get_libdir)" |
| 286 |
- EOF |
| 287 |
- |
| 288 |
-} |
| 289 |
- |
| 290 |
-src_compile() { |
| 291 |
- |
| 292 |
- # Julia accesses /proc/self/mem on Linux |
| 293 |
- addpredict /proc/self/mem |
| 294 |
- |
| 295 |
- emake cleanall |
| 296 |
- emake julia-release \ |
| 297 |
- prefix="${EPREFIX}/usr" DESTDIR="${D}" \ |
| 298 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
| 299 |
- pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') |
| 300 |
- emake |
| 301 |
-} |
| 302 |
- |
| 303 |
-src_test() { |
| 304 |
- emake test |
| 305 |
-} |
| 306 |
- |
| 307 |
-src_install() { |
| 308 |
- # Julia is special. It tries to find a valid git repository (that would |
| 309 |
- # normally be cloned during compilation/installation). Just make it |
| 310 |
- # happy... |
| 311 |
- git init && \ |
| 312 |
- git config --local user.email "whatyoudoing@×××××××.com" && \ |
| 313 |
- git config --local user.name "Whyyyyyy" && \ |
| 314 |
- git commit -a --allow-empty -m "initial" || die "git failed" |
| 315 |
- |
| 316 |
- emake install \ |
| 317 |
- prefix="${EPREFIX}/usr" DESTDIR="${D}" \ |
| 318 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
| 319 |
- cat > 99julia <<-EOF |
| 320 |
- LDPATH=${EROOT%/}/usr/$(get_libdir)/julia |
| 321 |
- EOF |
| 322 |
- doenvd 99julia |
| 323 |
- |
| 324 |
- dodoc README.md |
| 325 |
- |
| 326 |
- mv "${ED}"/usr/etc/julia "${ED}"/etc || die |
| 327 |
- rmdir "${ED}"/usr/etc || die |
| 328 |
- mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die |
| 329 |
- rmdir "${ED}"/usr/share/doc/julia || die |
| 330 |
-} |
Archives