From c52e24e7b5cc3b2c744853aa30a153c8c00b15fd Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sun, 17 Sep 2017 19:17:44 -0400 Subject: [PATCH 1/4] Move BLAS and LAPACK flags before System flags A minor stylistic change that makes it easier to keep all of the `USE_SYSTEM_*` flags together and extend them without burying them in the `USE_SYSTEM_*` flags. --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index c9ecac70..cdf8d521 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,10 +6,10 @@ export LIBRARY_PATH=${PREFIX}/lib export CMAKE_PREFIX_PATH=${PREFIX} make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ + LIBBLAS=-lopenblas LIBBLASNAME=libopenblas.so LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas.so \ USE_SYSTEM_LIBGIT2=1 USE_LLVM_SHLIB=0 USE_SYSTEM_CURL=1 USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_LLVM=0 USE_SYSTEM_BLAS=1 USE_SYSTEM_PCRE=1 \ USE_SYSTEM_FFTW=1 USE_SYSTEM_GMP=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_SUITESPARSE=1 \ - LIBBLAS=-lopenblas LIBBLASNAME=libopenblas.so LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas.so \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ install From af3a75d43cc27bfc0c573407e2fa202585b69beb Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sun, 17 Sep 2017 19:21:58 -0400 Subject: [PATCH 2/4] Require openspecfun This is a dependency of Julia's that is normally built internally. However it can be built externally and used in the Julia build. In order to better express Julia's requirements, we break this out and make it an external dependency of Julia. For now we pin openspecfun exactly as we are unsure of its compatibility between versions. Plus we want to make sure it matches what Julia wants it to be. We can revisit how to pin openspecfun once we know more about its compatibility. --- recipe/build.sh | 1 + recipe/meta.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index cdf8d521..42d64479 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -10,6 +10,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ USE_SYSTEM_LIBGIT2=1 USE_LLVM_SHLIB=0 USE_SYSTEM_CURL=1 USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_LLVM=0 USE_SYSTEM_BLAS=1 USE_SYSTEM_PCRE=1 \ USE_SYSTEM_FFTW=1 USE_SYSTEM_GMP=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_OPENSPECFUN=1 \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e0f2b399..d8615624 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,6 +29,7 @@ requirements: - perl 5.20.* - openblas 0.2.19|0.2.19.* - openlibm 0.5.4 + - openspecfun 0.5.3 - blas 1.1 {{ variant }} - fftw - gmp 6.1.* @@ -48,6 +49,7 @@ requirements: - mpfr 3.1.* - openblas 0.2.19|0.2.19.* - openlibm 0.5.4 + - openspecfun 0.5.3 - blas 1.1 {{ variant }} - arpack - suitesparse From e1934cee622cf10eea4bdba9f34c6e9a4bd0a18d Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sun, 17 Sep 2017 19:24:32 -0400 Subject: [PATCH 3/4] Drop gcc and libgcc Neither of these are needed any more as all the compiled code is now C or C++. Any portions that use Fortran are now broken out as dependencies. So the regular system toolchain should be sufficient for building Julia. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d8615624..474a2680 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,6 @@ build: requirements: build: - - gcc # [linux] - toolchain - patchelf - cmake @@ -42,7 +41,6 @@ requirements: run: - zlib 1.2.8 - - libgcc # [linux] - libgit2 - fftw - gmp 6.1.* From cf705ea41a8d7a2273707bb766a28bf49dfdbe34 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sun, 17 Sep 2017 19:27:11 -0400 Subject: [PATCH 4/4] Bump build number to 4 As this now has a new dependency, openspecfun, and no longer uses the gcc package, we need to do a rebuild to get a package built with these changed dependencies. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 474a2680..55c033e6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: build: skip: True # [osx or win] - number: 3 + number: 4 features: - blas_{{ variant }}