Skip to content

Commit 4b2b00d

Browse files
authored
update netcdf to 4.9.2 (#45)
The patch file is not really needed as it is for cmake.
1 parent b679851 commit 4b2b00d

File tree

2 files changed

+55
-5
lines changed

2 files changed

+55
-5
lines changed

build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,16 +1140,18 @@ cd $WRKDIR/$PACK
11401140

11411141
###this is a hack
11421142
sed -i s/-ldf/-lhdf/ configure
1143-
sed -i 's/libnetcdf_la_LDFLAGS = /libnetcdf_la_LDFLAGS = -no-undefined /' liblib/Makefile.in
1143+
#sed -i 's/libnetcdf_la_LDFLAGS = /libnetcdf_la_LDFLAGS = -no-undefined /' liblib/Makefile.in
11441144

11451145
save_configure_help
1146-
CPPFLAGS=-I$OUTINC LDFLAGS=-L$OUTLIB xxrun ./configure $HOSTBUILD --prefix=$OUT --enable-static=no --enable-shared=yes \
1146+
CPPFLAGS=-I$OUTINC LDFLAGS="-L$OUTLIB -Wl,--export-all-symbols" \
1147+
xxrun ./configure $HOSTBUILD --prefix=$OUT --enable-static=no --enable-shared=yes \
11471148
--enable-hdf4 --disable-dap --disable-dynamic-loading \
11481149
--disable-utilities --disable-plugins \
1149-
--disable-nczarr-filters --disable-nczarr
1150+
--disable-nczarr-filters --disable-nczarr \
1151+
--disable-byterange
11501152
patch_libtool
1151-
xxrun make
1152-
xxrun make check
1153+
xxrun make
1154+
xxrun make check
11531155
xxrun make install
11541156
;;
11551157

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff -urN netcdf-c-4.9.0/cmake/modules/FindZip.cmake.orig netcdf-c-4.9.0/cmake/modules/FindZip.cmake
2+
--- netcdf-c-4.9.0/cmake/modules/FindZip.cmake.orig 2022-06-23 17:20:15.443959500 +0200
3+
+++ netcdf-c-4.9.0/cmake/modules/FindZip.cmake 2022-06-23 17:20:24.156687000 +0200
4+
@@ -39,7 +39,7 @@
5+
PATHS ${Zip_LIBRARY_DIRS} NO_DEFAULT_PATH)
6+
7+
SET(Zip_LIBRARIES )
8+
- IF(Zip_DEBUG_LIBRARY AND Zip_RELEASE_LIBRARY)
9+
+ IF(Zip_DEBUG_LIBRARY AND Zip_RELEASE_LIBRARY AND NOT (Zip_DEBUG_LIBRARY STREQUAL Zip_RELEASE_LIBRARY))
10+
SET(Zip_LIBRARIES debug ${Zip_DEBUG_LIBRARY} optimized ${Zip_RELEASE_LIBRARY})
11+
ELSEIF(Zip_DEBUG_LIBRARY)
12+
SET(Zip_LIBRARIES ${Zip_DEBUG_LIBRARY})
13+
diff -urN netcdf-c-4.9.0/cmake/modules/FindBlosc.cmake.orig netcdf-c-4.9.0/cmake/modules/FindBlosc.cmake
14+
--- netcdf-c-4.9.0/cmake/modules/FindBlosc.cmake.orig 2022-06-23 17:59:01.868937600 +0200
15+
+++ netcdf-c-4.9.0/cmake/modules/FindBlosc.cmake 2022-06-23 18:07:01.844880800 +0200
16+
@@ -39,7 +39,7 @@
17+
PATHS ${Blosc_LIBRARY_DIRS} NO_DEFAULT_PATH)
18+
19+
SET(Blosc_LIBRARIES )
20+
- IF(Blosc_DEBUG_LIBRARY AND Blosc_RELEASE_LIBRARY)
21+
+ IF(Blosc_DEBUG_LIBRARY AND Blosc_RELEASE_LIBRARY AND NOT (Blosc_DEBUG_LIBRARY STREQUAL Blosc_RELEASE_LIBRARY))
22+
SET(Blosc_LIBRARIES debug ${Blosc_DEBUG_LIBRARY} optimized ${Blosc_RELEASE_LIBRARY})
23+
ELSEIF(Blosc_DEBUG_LIBRARY)
24+
SET(Blosc_LIBRARIES ${Blosc_DEBUG_LIBRARY})
25+
diff -urN netcdf-c-4.9.0/cmake/modules/FindZstd.cmake.orig netcdf-c-4.9.0/cmake/modules/FindZstd.cmake
26+
--- netcdf-c-4.9.0/cmake/modules/FindZstd.cmake.orig 2022-06-10 23:04:15.000000000 +0200
27+
+++ netcdf-c-4.9.0/cmake/modules/FindZstd.cmake 2022-06-23 18:10:24.665696300 +0200
28+
@@ -39,7 +39,7 @@
29+
PATHS ${Zstd_LIBRARY_DIRS} NO_DEFAULT_PATH)
30+
31+
SET(Zstd_LIBRARIES )
32+
- IF(Zstd_DEBUG_LIBRARY AND Zstd_RELEASE_LIBRARY)
33+
+ IF(Zstd_DEBUG_LIBRARY AND Zstd_RELEASE_LIBRARY AND NOT (Zstd_DEBUG_LIBRARY STREQUAL Zstd_RELEASE_LIBRARY))
34+
SET(Zstd_LIBRARIES debug ${Zstd_DEBUG_LIBRARY} optimized ${Zstd_RELEASE_LIBRARY})
35+
ELSEIF(Zstd_DEBUG_LIBRARY)
36+
SET(Zstd_LIBRARIES ${Zstd_DEBUG_LIBRARY})
37+
diff -urN netcdf-c-4.9.0/cmake/modules/FindBz2.cmake.orig netcdf-c-4.9.0/cmake/modules/FindBz2.cmake
38+
--- netcdf-c-4.9.0/cmake/modules/FindBz2.cmake.orig 2022-06-10 23:04:15.000000000 +0200
39+
+++ netcdf-c-4.9.0/cmake/modules/FindBz2.cmake 2022-06-23 18:13:29.254600600 +0200
40+
@@ -39,7 +39,7 @@
41+
PATHS ${Bz2_LIBRARY_DIRS} NO_DEFAULT_PATH)
42+
43+
SET(Bz2_LIBRARIES )
44+
- IF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY)
45+
+ IF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY AND NOT (Bz2_DEBUG_LIBRARY STREQUAL Bz2_RELEASE_LIBRARY))
46+
SET(Bz2_LIBRARIES debug ${Bz2_DEBUG_LIBRARY} optimized ${Bz2_RELEASE_LIBRARY})
47+
ELSEIF(Bz2_DEBUG_LIBRARY)
48+
SET(Bz2_LIBRARIES ${Bz2_DEBUG_LIBRARY})

0 commit comments

Comments
 (0)