Skip to content

Commit

Permalink
Use 2.19.0 (#641)
Browse files Browse the repository at this point in the history
* Use 2.19.0-rc1, update Windows Makevars.win for new AWS libs

* Cope with possible lib64/ directory in artifact

* Use 2.19.0
  • Loading branch information
eddelbuettel authored Dec 20, 2023
1 parent 0a800e6 commit 486e65a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
13 changes: 9 additions & 4 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tools/fetchTileDB.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/tiledbVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version: 2.18.3
sha: 8f8b766
version: 2.19.0
sha: fa30a88a

0 comments on commit 486e65a

Please sign in to comment.