From 0f24c9f6417211ea66cd1c64f842b8bbb244a4c4 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Fri, 6 Apr 2018 17:49:32 -0300 Subject: [PATCH 1/5] Do not build debug by default --- recipe/build.sh | 2 ++ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index f0ebad36..9732f8f9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,6 +2,7 @@ # Build static. cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \ + -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_LIBDIR:PATH=$PREFIX/lib \ -D ENABLE_DAP=ON \ -D ENABLE_HDF4=ON \ @@ -21,6 +22,7 @@ make clean # Build shared. cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \ + -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_LIBDIR:PATH=$PREFIX/lib \ -D ENABLE_DAP=ON \ -D ENABLE_HDF4=ON \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5ab86ba5..858b4172 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: - CMakeLists.patch # [win] build: - number: 0 + number: 1 skip: True # [win and py36 or py27] features: - vc14 # [win and (py35 or py36)] From 414728c928cea1cdb3fd0d7153faae4c78aa1d96 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 15 Apr 2018 15:30:01 -0300 Subject: [PATCH 2/5] remove patches --- recipe/back_port_512.patch | 22 ---------------------- recipe/back_port_573.patch | 36 ------------------------------------ 2 files changed, 58 deletions(-) delete mode 100644 recipe/back_port_512.patch delete mode 100644 recipe/back_port_573.patch diff --git a/recipe/back_port_512.patch b/recipe/back_port_512.patch deleted file mode 100644 index 672ca443..00000000 --- a/recipe/back_port_512.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- netcdf-c-4.5.0.orig/libdap2/dapcvt.c 2017-10-20 14:20:52.000000000 -0300 -+++ netcdf-c-4.5.0/libdap2/dapcvt.c 2017-10-24 11:06:14.777836188 -0300 -@@ -217,7 +217,8 @@ - #ifdef _MSC_VER - _ASSERTE(_CrtCheckMemory()); - #endif -- if(ival < 0 || ival > NC_MAX_UBYTE) ok = 0; -+ /* For back compatibility, we allow any value, but force conversion */ -+ ival = (ival & 0xFF); - *p = (char)ival; - } break; - case NC_CHAR: { -@@ -246,7 +247,8 @@ - unsigned int uval; - ok = sscanf(s,"%u%n",&uval,&nread); - _ASSERTE(_CrtCheckMemory()); -- if(uval > NC_MAX_UBYTE) ok = 0; -+ /* For back compatibility, we allow any value, but force conversion */ -+ uval = (uval & 0xFF); - *p = (unsigned char)uval; - #else - ok = sscanf(s,"%hhu%n",p,&nread); diff --git a/recipe/back_port_573.patch b/recipe/back_port_573.patch deleted file mode 100644 index 328f8974..00000000 --- a/recipe/back_port_573.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- netcdf-c-4.5.0.orig/oc2/daplex.c 2017-10-20 15:20:52.000000000 -0200 -+++ netcdf-c-4.5.0/oc2/daplex.c 2017-11-02 17:29:25.980656768 -0200 -@@ -40,16 +40,28 @@ - "{}[]:;=,"; - - /* Define 1 and > 1st legal characters */ -+/* Note: for some reason I added # and removed !~'" -+ what was I thinking? -+*/ - static char* ddswordchars1 = -- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-+_/%\\.*"; -+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -+ "-+_/%\\.*!~'\""; - static char* ddswordcharsn = -- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-+_/%\\.*#"; -+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -+ "-+_/%\\.*!~'\""; -+ -+/* This includes sharp and colon for historical reasons */ - static char* daswordcharsn = -- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-+_/%\\.*#:"; -+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -+ "-+_/%\\.*#:!~'\""; -+ -+/* Need to remove '.' to allow for fqns */ - static char* cewordchars1 = -- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-+_/%\\"; -+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -+ "-+_/%\\*!~'\""; - static char* cewordcharsn = -- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-+_/%\\"; -+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -+ "-+_/%\\*!~'\""; - - /* Current sets of legal characters */ - /* From ab2f0a08847463f9278b81d13433d253b545cfe3 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 15 Apr 2018 15:31:16 -0300 Subject: [PATCH 3/5] build release on Win --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 1f5b020e..b0a60ab8 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,6 +2,7 @@ mkdir %SRC_DIR%\build cd %SRC_DIR%\build cmake -G "NMake Makefiles" ^ + -D CMAKE_BUILD_TYPE=Release ^ -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -D BUILD_SHARED_LIBS=ON ^ -D ENABLE_TESTS=OFF ^ From fbbe4ba09c19dbc95e003cdc2c56c9c591ed4998 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 15 Apr 2018 18:28:59 -0300 Subject: [PATCH 4/5] this ncei endpoint is not OK :-/ --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 858b4172..2a61c516 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,7 +44,7 @@ test: - ncdump -h "https://data.nodc.noaa.gov/thredds/dodsC/ioos/sccoos/scripps_pier/scripps_pier-2016.nc" - ncdump -h "http://oos.soest.hawaii.edu/thredds/dodsC/hioos/model/atm/ncep_pac/NCEP_Pacific_Atmospheric_Model_best.ncd" - ncdump -h "http://oos.soest.hawaii.edu/thredds/dodsC/usgs_dem_10m_tinian" - - ncdump -h "https://www.ncei.noaa.gov/thredds/dodsC/namanl/201609/20160929/namanl_218_20160929_1800_006.grb" + # - ncdump -h "https://www.ncei.noaa.gov/thredds/dodsC/namanl/201609/20160929/namanl_218_20160929_1800_006.grb" - conda inspect linkages -p $PREFIX $PKG_NAME # [not win] - conda inspect objects -p $PREFIX $PKG_NAME # [osx] From 3ca77f3f66aab4ee4eb1e5b28d2f9d32923d8aa3 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 16 Apr 2018 10:45:18 -0300 Subject: [PATCH 5/5] try cmake's curl version --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2a61c516..09d85c7e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,13 +22,13 @@ requirements: - cmake - pkg-config # [not win] - msinttypes # [win] - - curl 7.55.* + - curl >=7.44.0,<8 - zlib 1.2.11 - hdf4 - hdf5 1.10.1 - vc 14 # [win and (py35 or py36)] run: - - curl >=7.55,<8 + - curl >=7.44.0,<8 - zlib 1.2.11 - hdf4 - hdf5 1.10.1