Skip to content

Commit 053c26b

Browse files
committed
wind it back... smaller edits. it seems like installing netcdf4 as a downstream req is getting pulled in as a nompi build
1 parent 0379ad5 commit 053c26b

File tree

2 files changed

+7
-42
lines changed

2 files changed

+7
-42
lines changed

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ echo ""
7777

7878
echo ""
7979
#CFLAGS=`nc-config --cflags`
80-
CFLAGS="-I${PREFIX}/include"
80+
CFLAGS="-fPIC -I${PREFIX}/include"
8181
#export CFLAGS=`nc-config --cflags`
8282
echo "CFLAGS is:"
8383
echo $CFLAGS
8484
echo ""
8585

8686
echo ""
8787
#FCFLAGS=`nf-config --fflags`
88-
FCFLAGS="-I${PREFIX}/include"
88+
FCFLAGS="-fPIC -I${PREFIX}/include"
8989
#export FCFLAGS=`nf-config --fflags`
9090
echo "FCFLAGS is:"
9191
echo $FCFLAGS

meta.yaml

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ requirements:
2626
- conda-forge::make=4.2.*
2727
- conda-forge::netcdf-fortran=4.6.*
2828
- conda-forge::nco=5.2.*
29-
- conda-forge::numpy<2
29+
- conda-forge::numpy=1.26.*
3030
- conda-forge::perl=5.*
3131
- conda-forge::python=3.11.*
3232
- conda-forge::pytest
@@ -52,33 +52,7 @@ requirements:
5252
- conda-forge::make=4.2.*
5353
- conda-forge::netcdf-fortran=4.6.*
5454
- conda-forge::nco=5.2.*
55-
- conda-forge::numpy<2
56-
- conda-forge::perl=5.*
57-
- conda-forge::python=3.11.*
58-
- conda-forge::pytest
59-
- conda-forge::tempest-remap!=2.2.0
60-
- conda-forge::tcsh
61-
- conda-forge::which
62-
- conda-forge::zlib-ng=2.2.*
63-
64-
test:
65-
- conda-forge::autoconf=2.69
66-
- conda-forge::automake=1.16.*
67-
- conda-forge::coreutils
68-
- conda-forge::c-compiler
69-
- conda-forge::gsl=2.*
70-
- conda-forge::gcc=13.3.*
71-
- conda-forge::gfortran=13.3.*
72-
- conda-forge::hdf5=1.14.3=*mpich*
73-
- conda-forge::libgcc=13.3.*
74-
- conda-forge::libgfortran=13.3.*
75-
- conda-forge::libnetcdf==4.9.2
76-
- conda-forge::libtool
77-
- conda-forge::mpich==4.2.3
78-
- conda-forge::make=4.2.*
79-
- conda-forge::netcdf-fortran=4.6.*
80-
- conda-forge::nco=5.2.*
81-
- conda-forge::numpy<2
55+
- conda-forge::numpy=1.26.*
8256
- conda-forge::perl=5.*
8357
- conda-forge::python=3.11.*
8458
- conda-forge::pytest
@@ -104,7 +78,7 @@ requirements:
10478
- conda-forge::make=4.2.*
10579
- conda-forge::netcdf-fortran=4.6.*
10680
- conda-forge::nco=5.2.*
107-
- conda-forge::numpy<2
81+
- conda-forge::numpy=1.26.*
10882
- conda-forge::perl=5.*
10983
- conda-forge::python=3.11.*
11084
- conda-forge::pytest
@@ -167,18 +141,9 @@ test:
167141
# Run actual tests using the repository's test infrastructure
168142
# vanilla
169143
- echo "Setting up test environment..."
170-
# - CC=`nc-config --cc`
171-
# - FC=`nf-config --fc`
172-
# - CFLAGS=`nc-config --cflags`
173-
# - FCFLAGS=`nf-config --fflags`
174-
# - LDFLAGS=`nc-config --libs`
175-
- autoreconf -iv
176-
- ./configure --prefix=$PREFIX --with-mpi --enable-quad-precision
144+
- autoreconf -iv --include $PREFIX/include
145+
- ./configure --includedir $PREFIX/include --prefix=$PREFIX --with-mpi --enable-quad-precision
177146
- make check RUN_VERY_EXPENSIVE_TESTS=no RUN_EXPENSIVE_TESTS=no || echo "make check failed in conda build. guarding against that failure so the tarball still gets put out!"
178-
# # --with-mpi --enable-quad-precision
179-
# - echo "Setting up test environment..."
180-
# - autoreconf -i && ./configure --with-mpi --enable-quad-precision && make check RUN_EXPENSIVE_TESTS=no
181-
182147

183148
# Test key installed programs with help flags (allow help commands to exit with any status)
184149
- echo "Testing timavg script..."

0 commit comments

Comments
 (0)