From 9dedd9a7955d65389a5d40f600473036bb7bb84c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 2 Dec 2017 19:36:32 +0100 Subject: [PATCH] julia: update to 0.6.1. Compile for generic x86-64 target to not depend on SSSE3. Closes #7710. --- srcpkgs/julia/template | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 92eda7a9ad8..c29a6e211f8 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,7 +1,8 @@ # Template file for 'julia' pkgname=julia -version=0.6.0 -revision=4 +version=0.6.1 +revision=1 +wrksrc="julia" nocross=yes build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=1 @@ -10,7 +11,7 @@ make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1" make_install_args=$make_build_args -hostmakedepends="curl llvm3.9 gcc-fortran perl cmake python m4" +hostmakedepends="curl llvm3.9 gcc-fortran perl cmake python m4 git" makedepends="openblas-devel lapack-devel arpack-ng-devel fftw-devel pcre2-devel gmp-devel mpfr-devel libgit2-devel libcurl-devel libssh2-devel mbedtls-devel" @@ -23,22 +24,26 @@ maintainer="Francisco Gómez " license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}.tar.gz" -checksum="1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665" +checksum=e68adfa85df529f8ad092a9bf85d2350101c658fe455c5ebf2b6d119359e10d9 -if [[ $XBPS_MACHINE == 'i686' ]]; then +case $XBPS_MACHINE in +i686) export M="pentium4" export CFLAGS="-march=pentium4" export CXXFLAGS="-march=pentium4" make_build_args+=" MARCH=pentium4" -elif [[ $XBPS_MACHINE == 'x86_64' ]]; then - export M="core2" - export CFLAGS="-march=core2" - export CXXFLAGS="-march=core2" - make_build_args+=" MARCH=core2" -fi - -CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1" + ;; +x86_64) + export M="x86-64" + export CFLAGS="-march=x86-64" + export CXXFLAGS="-march=x86-64" + make_build_args+=" MARCH=x86-64" + ;; +esac +post_extract() { + sed -i '/^install:/s| \$(BUILDROOT)/doc.*||' Makefile +} post_install() { vlicense LICENSE.md }