From c70531be62f51d5c40db4ae593a8296a9b5f7cd8 Mon Sep 17 00:00:00 2001 From: extrowerk <5569059+extrowerk@users.noreply.github.com> Date: Sat, 28 May 2022 11:06:34 +0200 Subject: [PATCH] NetCDF: bump (#6661) * NetCDF: bump * Add lobotomized netcdf47 recipe * Netcdf-Fortran:bump * netcdf47, rename to netcdf4.7 Co-authored-by: begasus --- ...etcdf-4.7.2.recipe => netcdf-4.8.1.recipe} | 15 +- sci-libs/netcdf/netcdf4.7-4.7.2.recipe | 90 +++++++++ sci-libs/netcdf/patches/netcdf-4.8.1.patchset | 177 ++++++++++++++++++ ...5.2.recipe => netcdf_fortran-4.5.4.recipe} | 6 +- 4 files changed, 280 insertions(+), 8 deletions(-) rename sci-libs/netcdf/{netcdf-4.7.2.recipe => netcdf-4.8.1.recipe} (86%) create mode 100644 sci-libs/netcdf/netcdf4.7-4.7.2.recipe create mode 100644 sci-libs/netcdf/patches/netcdf-4.8.1.patchset rename sci-libs/netcdf_fortran/{netcdf_fortran-4.5.2.recipe => netcdf_fortran-4.5.4.recipe} (95%) diff --git a/sci-libs/netcdf/netcdf-4.7.2.recipe b/sci-libs/netcdf/netcdf-4.8.1.recipe similarity index 86% rename from sci-libs/netcdf/netcdf-4.7.2.recipe rename to sci-libs/netcdf/netcdf-4.8.1.recipe index dcb838dfa..6df578c42 100644 --- a/sci-libs/netcdf/netcdf-4.7.2.recipe +++ b/sci-libs/netcdf/netcdf-4.8.1.recipe @@ -8,16 +8,16 @@ and sharing of scientific data." HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" COPYRIGHT="1993-2016 University Corporation for Atmospheric Research/Unidata" LICENSE="UCAR_Unidata" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/Unidata/netcdf-c/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="7648db7bd75fdd198f7be64625af7b276067de48a49dcdfd160f1c2ddff8189c" +CHECKSUM_SHA256="bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0" SOURCE_DIR="netcdf-c-$portVersion" -PATCHES="netcdf-$portVersion.patchset" +#PATCHES="netcdf-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" -libVersion="15.2.0" +libVersion="19.0.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -28,6 +28,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix lib:libhdf5$secondaryArchSuffix lib:libhdf5_hl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -40,6 +41,8 @@ PROVIDES_devel=" cmd:ncdump$secondaryArchSuffix = $portVersion cmd:ncgen$secondaryArchSuffix = $portVersion cmd:ncgen3$secondaryArchSuffix = $portVersion + cmd:nc4print$secondaryArchSuffix = $portVersion + cmd:ocprint$secondaryArchSuffix = $portVersion devel:libh5bzip2$secondaryArchSuffix = $portVersion devel:libnetcdf$secondaryArchSuffix = $libVersionCompat " @@ -47,6 +50,7 @@ REQUIRES_devel=" haiku$secondaryArchSuffix netcdf$secondaryArchSuffix == $portVersion base lib:libcurl$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix lib:libhdf5$secondaryArchSuffix lib:libhdf5_hl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -55,6 +59,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix + devel:libexecinfo$secondaryArchSuffix devel:libhdf5$secondaryArchSuffix devel:libhdf5_hl$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -77,7 +82,7 @@ defineDebugInfoPackage netcdf$secondaryArchSuffix \ BUILD() { mkdir -p haiku_build && cd haiku_build - runConfigure ../configure + LDFLAGS="-lexecinfo" runConfigure ../configure make $jobArgs } diff --git a/sci-libs/netcdf/netcdf4.7-4.7.2.recipe b/sci-libs/netcdf/netcdf4.7-4.7.2.recipe new file mode 100644 index 000000000..1833f1c9b --- /dev/null +++ b/sci-libs/netcdf/netcdf4.7-4.7.2.recipe @@ -0,0 +1,90 @@ +SUMMARY="Scientific library and interface for array oriented data access" +DESCRIPTION="NetCDF (network Common Data Form) is an interface for \ +scientific data access and a freely-distributed software library that \ +provides an implementation of the interface. The netCDF library also \ +defines a machine-independent format for representing scientific data. \ +Together, the interface, library, and format support the creation, access, \ +and sharing of scientific data." +HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" +COPYRIGHT="1993-2016 University Corporation for Atmospheric Research/Unidata" +LICENSE="UCAR_Unidata" +REVISION="3" +SOURCE_URI="https://github.com/Unidata/netcdf-c/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="7648db7bd75fdd198f7be64625af7b276067de48a49dcdfd160f1c2ddff8189c" +SOURCE_DIR="netcdf-c-$portVersion" +PATCHES="netcdf-$portVersion.patchset" + +ARCHITECTURES="all !x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86" + +libVersion="15.2.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + netcdf4.7$secondaryArchSuffix = $portVersion + lib:libh5bzip2$secondaryArchSuffix = $portVersion + lib:libnetcdf$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libhdf5$secondaryArchSuffix + lib:libhdf5_hl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +REPLACES=" + netcdf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libhdf5$secondaryArchSuffix + devel:libhdf5_hl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:dd + cmd:g++$secondaryArchSuffix + cmd:grep + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " + +defineDebugInfoPackage netcdf47$secondaryArchSuffix \ + "$libDir"/libh5bzip2.so \ + "$libDir"/libnetcdf.so.$libVersion + +BUILD() +{ + mkdir -p haiku_build && cd haiku_build + runConfigure ../configure + make $jobArgs +} + +INSTALL() +{ + cd haiku_build + make install $jobArgs + + rm -f $libDir/lib*.la $libDir/libnetcdf.a + + prepareInstalledDevelLibs \ + libh5bzip2 \ + libnetcdf + + fixPkgconfig + + rm -rf $binDir \ + $developDir \ + $manDir +} + +TEST() +{ + cd haiku_build + make check +} diff --git a/sci-libs/netcdf/patches/netcdf-4.8.1.patchset b/sci-libs/netcdf/patches/netcdf-4.8.1.patchset new file mode 100644 index 000000000..ad02606ef --- /dev/null +++ b/sci-libs/netcdf/patches/netcdf-4.8.1.patchset @@ -0,0 +1,177 @@ +From b49402fdb2504c17fe7f8032dc46ac1fa1dd1523 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 19 Nov 2019 12:27:04 +0100 +Subject: local is a reserved word + + +diff --git a/libdispatch/dcrc32.c b/libdispatch/dcrc32.c +index 3878841..afb0820 100644 +--- a/libdispatch/dcrc32.c ++++ b/libdispatch/dcrc32.c +@@ -73,7 +73,7 @@ UCAR + /* Define some of the macros used here */ + #define FAR + #define ZEXPORT +-#define local static ++#define netcdf_local static + #define OF(x) x + #define uLong unsigned long + #define uInt unsigned int +@@ -99,24 +99,24 @@ UCAR + # define BYFOUR + #endif + #ifdef BYFOUR +- local unsigned long crc32_little OF((unsigned long, ++ netcdf_local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, z_size_t)); +- local unsigned long crc32_big OF((unsigned long, ++ netcdf_local unsigned long crc32_big OF((unsigned long, + const unsigned char FAR *, z_size_t)); + # define TBLS 8 + #else + # define TBLS 1 + #endif /* BYFOUR */ + +-local const z_crc_t FAR crc_table[TBLS][256]; ++netcdf_local const z_crc_t FAR crc_table[TBLS][256]; + + #ifdef DYNAMIC_CRC_TABLE + +-local volatile int crc_table_empty = 1; +-local z_crc_t FAR crc_table[TBLS][256]; +-local void make_crc_table OF((void)); ++netcdf_local volatile int crc_table_empty = 1; ++netcdf_local z_crc_t FAR crc_table[TBLS][256]; ++netcdf_local void make_crc_table OF((void)); + #ifdef MAKECRCH +- local void write_table OF((FILE *, const z_crc_t FAR *)); ++ netcdf_local void write_table OF((FILE *, const z_crc_t FAR *)); + #endif /* MAKECRCH */ + /* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: +@@ -144,7 +144,7 @@ local void make_crc_table OF((void)); + allow for word-at-a-time CRC calculation for both big-endian and little- + endian machines, where a word is four bytes. + */ +-local void make_crc_table() ++netcdf_local void make_crc_table() + { + z_crc_t c; + int n, k; +@@ -203,7 +203,7 @@ local void make_crc_table() + if (out == NULL) return; + fprintf(out, "/* dcrc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by dcrc32.c\n */\n\n"); +- fprintf(out, "local const z_crc_t FAR "); ++ fprintf(out, "netcdf_local const z_crc_t FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); + # ifdef BYFOUR +@@ -221,7 +221,7 @@ local void make_crc_table() + } + + #ifdef MAKECRCH +-local void write_table(out, table) ++netcdf_local void write_table(out, table) + FILE *out; + const z_crc_t FAR *table; + { +@@ -245,7 +245,7 @@ local void write_table(out, table) + * This function can be used by asm versions of crc32() + */ + #if 0 /* Unused */ +-local const z_crc_t FAR * ZEXPORT get_crc_table() ++netcdf_local const z_crc_t FAR * ZEXPORT get_crc_table() + { + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) +@@ -260,7 +260,7 @@ local const z_crc_t FAR * ZEXPORT get_crc_table() + #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + + /* ========================================================================= */ +-local unsigned long ZEXPORT crc32_z(crc, buf, len) ++netcdf_local unsigned long ZEXPORT crc32_z(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + z_size_t len; +@@ -325,7 +325,7 @@ NC_crc32(unsigned int crc, const void* buf, unsigned int len) + #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 + + /* ========================================================================= */ +-local unsigned long crc32_little(crc, buf, len) ++netcdf_local unsigned long crc32_little(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + z_size_t len; +@@ -365,7 +365,7 @@ local unsigned long crc32_little(crc, buf, len) + #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 + + /* ========================================================================= */ +-local unsigned long crc32_big(crc, buf, len) ++netcdf_local unsigned long crc32_big(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + z_size_t len; +@@ -404,7 +404,7 @@ local unsigned long crc32_big(crc, buf, len) + + /* ========================================================================= */ + #if 0 /* Unused */ +-local unsigned long gf2_matrix_times(mat, vec) ++netcdf_local unsigned long gf2_matrix_times(mat, vec) + unsigned long *mat; + unsigned long vec; + { +@@ -421,7 +421,7 @@ local unsigned long gf2_matrix_times(mat, vec) + } + + /* ========================================================================= */ +-local void gf2_matrix_square(square, mat) ++netcdf_local void gf2_matrix_square(square, mat) + unsigned long *square; + unsigned long *mat; + { +@@ -433,7 +433,7 @@ local void gf2_matrix_square(square, mat) + + /* ========================================================================= */ + +-local uLong crc32_combine_(crc1, crc2, len2) ++netcdf_local uLong crc32_combine_(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +@@ -489,7 +489,7 @@ local uLong crc32_combine_(crc1, crc2, len2) + } + + /* ========================================================================= */ +-local uLong ZEXPORT crc32_combine(crc1, crc2, len2) ++netcdf_local uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; +@@ -497,7 +497,7 @@ local uLong ZEXPORT crc32_combine(crc1, crc2, len2) + return crc32_combine_(crc1, crc2, len2); + } + +-local uLong ZEXPORT crc32_combine64(crc1, crc2, len2) ++netcdf_local uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +diff --git a/libdispatch/dcrc32.h b/libdispatch/dcrc32.h +old mode 100755 +new mode 100644 +index 9e0c778..8fc35df +--- a/libdispatch/dcrc32.h ++++ b/libdispatch/dcrc32.h +@@ -2,7 +2,7 @@ + * Generated automatically by crc32.c + */ + +-local const z_crc_t FAR crc_table[TBLS][256] = ++netcdf_local const z_crc_t FAR crc_table[TBLS][256] = + { + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, +-- +2.30.2 + diff --git a/sci-libs/netcdf_fortran/netcdf_fortran-4.5.2.recipe b/sci-libs/netcdf_fortran/netcdf_fortran-4.5.4.recipe similarity index 95% rename from sci-libs/netcdf_fortran/netcdf_fortran-4.5.2.recipe rename to sci-libs/netcdf_fortran/netcdf_fortran-4.5.4.recipe index e0d41844b..82feafd72 100644 --- a/sci-libs/netcdf_fortran/netcdf_fortran-4.5.2.recipe +++ b/sci-libs/netcdf_fortran/netcdf_fortran-4.5.4.recipe @@ -9,15 +9,15 @@ top of the C library." HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" COPYRIGHT="1993-2014 University Corporation for Atmospheric Research/Unidata" LICENSE="UCAR_Unidata" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/Unidata/netcdf-fortran/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="0b05c629c70d6d224a3be28699c066bfdfeae477aea211fbf034d973a8309b49" +CHECKSUM_SHA256="1a8613cb639e83e2df5a8e6c21fa48a0c64b053c244abddecec66cfcac03a48a" SOURCE_DIR="netcdf-fortran-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="7.0.0" +libVersion="7.1.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES="