From 486e65a99763e89a33edb224cbc83a021a60b3ef Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Wed, 20 Dec 2023 13:03:43 -0600 Subject: [PATCH] Use 2.19.0 (#641) * Use 2.19.0-rc1, update Windows Makevars.win for new AWS libs * Cope with possible lib64/ directory in artifact * Use 2.19.0 --- src/Makevars.win | 13 +++++++++---- tools/fetchTileDB.sh | 1 + tools/tiledbVersion.txt | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Makevars.win b/src/Makevars.win index 28dfbcd963..66ead0302d 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -6,10 +6,15 @@ PKG_LIBS = \ -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \ -L$(RWINLIB)/lib$(R_ARCH)$(CRT) \ -ltiledbstatic -lbz2 -lzstd -llz4 -lz -lspdlog -lfmt \ - -lwebp -lwebpdecoder -lwebpdemux -lwebpmux -lsharpyuv \ - -llibmagic -lpcre2-posix -lpcre2-8 \ - -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 + -laws-cpp-sdk-identity-management -laws-cpp-sdk-cognito-identity -laws-cpp-sdk-sts -laws-cpp-sdk-s3 -laws-cpp-sdk-core \ + -llibmagic -lwebp -lpcre2-posix -lpcre2-8 \ + -laws-crt-cpp -laws-c-mqtt -laws-c-event-stream -laws-c-s3 -laws-c-auth -laws-c-http -laws-c-io \ + -lSecur32 -lCrypt32 \ + -laws-c-compression -laws-c-cal \ + -lNCrypt \ + -laws-c-sdkutils -laws-checksums -laws-c-common \ + -lBCrypt -lKernel32 -lRpcrt4 -lWininet -lWinhttp -lWs2_32 -lShlwapi -lUserenv -lversion -lws2_32 \ + -lsharpyuv all: clean winlibs diff --git a/tools/fetchTileDB.sh b/tools/fetchTileDB.sh index 885493695f..d98449cf70 100755 --- a/tools/fetchTileDB.sh +++ b/tools/fetchTileDB.sh @@ -41,6 +41,7 @@ if [ ! -d tiledb ]; then mkdir tiledb tar xzf ${tarball} -C tiledb rm ${tarball} + test -d tiledb/lib64 && mv tiledb/lib64 tiledb/lib fi ## Copy tiledb/lib/ so that rpath relative path also works from diff --git a/tools/tiledbVersion.txt b/tools/tiledbVersion.txt index 8c4acfbb10..de5c602360 100644 --- a/tools/tiledbVersion.txt +++ b/tools/tiledbVersion.txt @@ -1,2 +1,2 @@ -version: 2.18.3 -sha: 8f8b766 +version: 2.19.0 +sha: fa30a88a