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

Fixdependencies #12

Merged
merged 6 commits into from
Jul 5, 2019
Merged

Fixdependencies #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a73e2e6
add libcblas and libblas to meta.yaml
Jul 3, 2019
6399437
recompile libcf with new libblas and libcblas
Jul 5, 2019
e44bad1
change compiler to clang
Jul 5, 2019
fa1c6a1
add CFLAGS for osx64 in build
Jul 5, 2019
efe5204
fix CPPFLAGS and CFLAGS for clang
Jul 5, 2019
1ad4c55
force netcdf<4.7
Jul 5, 2019
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
environment:
WORKDIR: "test_macos_libcf_py2"
PY_VER: "py2"
CONDA_COMPILER: "gcc"
CONDA_COMPILER: "clang_osx-64"
steps:
- checkout
- run: *setup_miniconda
Expand All @@ -125,7 +125,7 @@ jobs:
environment:
WORKDIR: "test_macos_libcf_py3"
PY_VER: "py3"
CONDA_COMPILER: "gcc"
CONDA_COMPILER: "clang_osx-64"
steps:
- checkout
- run: *setup_miniconda
Expand Down
6 changes: 3 additions & 3 deletions cf_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

/* Define to a macro mangling the given C identifier (in lower and upper
case), which must not contain underscores, for linking with Fortran. */
/* #undef FC_FUNC */
#define FC_FUNC(name,NAME) name ## _

/* As FC_FUNC, but for C identifiers containing underscores. */
/* #undef FC_FUNC_ */
#define FC_FUNC_(name,NAME) name ## _

/* Define to 1 if you have `alloca', as a function or macro. */
#define HAVE_ALLOCA 1
Expand Down Expand Up @@ -70,7 +70,7 @@
#define HAVE_STRING_H 1

/* Define this if you have strlcat() */
/* #undef HAVE_STRLCAT */
#define HAVE_STRLCAT 1

/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
Expand Down
9 changes: 7 additions & 2 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#source activate "${CONDA_DEFAULT_ENV}"
export CFLAGS="-Wall -m64 -pipe -O2 -fPIC ${CFLAGS}"
export CFLAGS="-Wall -m64 -pipe -O2 -fPIC -I${PREFIX}/include ${CFLAGS}"
export CXXFLAGS="${CFLAGS} ${CXXFLAGS}"
export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}"
export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}"
export LFLAGS="-fPIC ${LFLAGS}"
export FC=""
# needed for clang_osx-64
if [ ${HOME} == "/Users/distiller" ]; then
export CFLAGS="-Wl,-syslibroot / -isysroot / ${CFLAGS}"
# configure need this otherwise "error.h" is not found and configure report netcdf.h
export CPPFLAGS="-Wl,-syslibroot / -isysroot / -I${PREFIX}/include ${CPPFLAGS}"
fi
./configure --prefix=${PREFIX}
make
make install
Expand Down
6 changes: 4 additions & 2 deletions recipe/meta.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,19 @@ requirements:
build:
- {{ compiler('c') }}
host:
- libnetcdf
- libnetcdf <4.7
- libblas
- libcblas
- curl >=7.44.0,<8
- python
- libuuid
run:
- libnetcdf
- libnetcdf <4.7
- curl >=7.44.0,<8
- python
- libuuid
- libblas
- libcblas

test:
imports:
Expand Down