Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=cca79e8b4dbfdc348dbc961ed3a4b65569d71dca
commit cca79e8b4dbfdc348dbc961ed3a4b65569d71dca Author: crazy <cr...@frugalware.org> Date: Fri Feb 9 12:50:54 2018 +0100 julia-0.6.2-1-x86_64 * Version bump * fix build() * added patches so we get it to compile diff --git a/source/devel-extra/julia/FrugalBuild b/source/devel-extra/julia/FrugalBuild index 23f9001..2fe8300 100644 --- a/source/devel-extra/julia/FrugalBuild +++ b/source/devel-extra/julia/FrugalBuild @@ -2,24 +2,35 @@ # Maintainer: Melko <me...@frugalware.org> pkgname=julia -pkgver=0.5.2 +pkgver=0.6.2 pkgrel=1 pkgdesc="High-level, high-performance dynamic programming language for technical computing." -depends=('libgfortran' 'gmp' 'libgit2>=0.25.0' 'libunwind' 'pcre2') -makedepends=('gcc-gfortran' 'git') +depends=('libgfortran' 'gmp' 'fftw' 'libgit2>=0.25.0' 'libunwind' 'pcre2' 'lapack' 'libcblas') +makedepends=('gcc-gfortran' 'git' 'cmake') groups=('devel-extra') archs=('x86_64') _F_github_tag_v="y" _F_github_author="JuliaLang" _F_gnome_iconcache="y" Finclude github -sha1sums=('7d3cf0792de12aff11604f6f1caa84b9c89499c1') +source=(https://github.com/JuliaLang/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz makefile.patch libunwind.patch) +sha1sums=('527c5458f5588f2fc14a71cc52b3c47fb314acac' \ + '24c5b00bd80a5128da264ea0afe2ad82ccfc70fd' \ + 'f81a3016f3e63068eea2ead95f8386ba5ff5b3f2') build() { Fcd - Fmakeinstall prefix=$Fprefix sysconfdir=/etc \ - MARCH=${CARCH/_/-} \ + Fpatchall + CFLAGS=${CFLAGS/-march=x86-64/} + CXXFLAGS=${CXXFLAGS/-march=x86-64/} + + _opts=(prefix=$Fprefix sysconfdir=/etc \ + MARCH=x86-64 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_READLINE=1 \ USE_SYSTEM_PCRE=1 \ @@ -29,8 +40,11 @@ build() { USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_ZLIB=1 \ - USE_MKL=0 \ - USE_LLVM_SHLIB=0 + USE_INTEL_MKL=0 \ + USE_LLVM_SHLIB=0) + + Fexec make ${_opts[@]} || Fdie + Fexec make DESTDIR=$Fdestdir ${_opts[@]} install || Fdie } # optimization OK diff --git a/source/devel-extra/julia/libunwind.patch b/source/devel-extra/julia/libunwind.patch new file mode 100644 index 0000000..4e13265 --- /dev/null +++ b/source/devel-extra/julia/libunwind.patch @@ -0,0 +1,14 @@ +--- julia-0.6.0/src/julia_internal.h.0 2017-06-25 16:10:29.688382943 +0000 ++++ julia-0.6.0/src/julia_internal.h 2017-06-25 16:11:15.328315342 +0000 +@@ -643,11 +643,8 @@ + typedef unw_context_t bt_context_t; + typedef unw_cursor_t bt_cursor_t; +-# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \ +- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR > 1)) + // Enable our memory manager only for libunwind with our patch or + // on a newer release + # define JL_UNW_HAS_FORMAT_IP 1 +-# endif + #endif + size_t rec_backtrace(uintptr_t *data, size_t maxsize); + size_t rec_backtrace_ctx(uintptr_t *data, size_t maxsize, bt_context_t *ctx); diff --git a/source/devel-extra/julia/makefile.patch b/source/devel-extra/julia/makefile.patch new file mode 100644 index 0000000..05a6d86 --- /dev/null +++ b/source/devel-extra/julia/makefile.patch @@ -0,0 +1,13 @@ +--- Makefile.orig 2017-10-28 17:06:53.003582943 +0000 ++++ Makefile 2017-10-28 17:07:27.690408154 +0000 +@@ -332,8 +332,7 @@ + $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" + endef + +-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html +- @$(MAKE) $(QUIET_MAKE) all ++install: + @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ + mkdir -p $(DESTDIR)$$subdir; \ + done + \ No newline at end of file _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git