Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require openspecfun #26

Merged
merged 4 commits into from
Sep 18, 2017
Merged

Require openspecfun #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c52e24e
Move BLAS and LAPACK flags before System flags
jakirkham Sep 17, 2017
af3a75d
Require openspecfun
jakirkham Sep 17, 2017
e1934ce
Drop gcc and libgcc
jakirkham Sep 17, 2017
cf705ea
Bump build number to 4
jakirkham Sep 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ 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 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these really needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe so. They had come from the staged-recipes PR ( conda-forge/staged-recipes#3503 ), but I'm not finding the part in the conversation where these were added. In any event, just changing where they show up here not adding them outright.

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 \
USE_SYSTEM_OPENSPECFUN=1 \
TAGGED_RELEASE_BANNER="conda-forge-julia release" \
install

Expand Down
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ source:

build:
skip: True # [osx or win]
number: 3
number: 4
features:
- blas_{{ variant }}

requirements:
build:
- gcc # [linux]
- toolchain
- patchelf
- cmake
Expand All @@ -29,6 +28,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.*
Expand All @@ -41,13 +41,13 @@ requirements:

run:
- zlib 1.2.8
- libgcc # [linux]
- libgit2
- fftw
- gmp 6.1.*
- mpfr 3.1.*
- openblas 0.2.19|0.2.19.*
- openlibm 0.5.4
- openspecfun 0.5.3
- blas 1.1 {{ variant }}
- arpack
- suitesparse
Expand Down