From eb49a1ae4bc06ccde82757fbacede20b50305b30 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Wed, 8 Sep 2021 10:06:58 -0500 Subject: [PATCH 1/2] Use TileDB 2.4.0 --- NEWS.md | 5 +++++ tools/tiledbVersion.txt | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index b256599646..09df28101b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Ongoing development +* This release of the R package builds against [TileDB 2.4.0](https://github.com/TileDB-Inc/TileDB/releases/tag/2.4.0), but has been tested against previous releases and the development version. + + +# tiledb 0.9.6 + * This release of the R package builds against [TileDB 2.3.4](https://github.com/TileDB-Inc/TileDB/releases/tag/2.3.4), but has been tested against previous releases and the development version. ## Improvements diff --git a/tools/tiledbVersion.txt b/tools/tiledbVersion.txt index 6bca12ad75..862860af6a 100644 --- a/tools/tiledbVersion.txt +++ b/tools/tiledbVersion.txt @@ -1,2 +1,2 @@ -version: 2.3.4 -sha: e19855e +version: 2.4.0 +sha: baf64e1 From 755e22c4fa90a63aa62be4547e1c0c06c2124b59 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Wed, 8 Sep 2021 13:26:29 -0500 Subject: [PATCH 2/2] also link against spdlog on Windows --- src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars.win b/src/Makevars.win index 0ead05a33b..826aed88b5 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -5,7 +5,7 @@ PKG_CPPFLAGS = -I../inst/include -I$(RWINLIB)/include -DTILEDB_STATIC_DEFINE PKG_LIBS = \ -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ -L$(RWINLIB)/lib$(R_ARCH)$(CRT) \ - -ltiledbstatic -lbz2 -lzstd -llz4 -lz \ + -ltiledbstatic -lbz2 -lzstd -llz4 -lz -lspdlog \ -laws-cpp-sdk-identity-management -laws-cpp-sdk-cognito-identity -laws-cpp-sdk-sts -laws-cpp-sdk-s3 -laws-cpp-sdk-core -laws-c-event-stream -laws-checksums -laws-c-common \ -lShlwapi -lBcrypt -lRpcrt4 -lWininet -lWinhttp -lws2_32 -lVersion -lUserenv