From f6e432b4982d413a6a5204777bc0ef40bc052f95 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 7 Dec 2022 19:52:47 +0800 Subject: [PATCH] fix: taosdump atomic for2.6 (#18782) * fix: taos-tools link atomic static for 2.6 * empty commit * fix: update taos-tools --- README-CN.md | 4 ++-- README.md | 4 ++-- src/kit/taos-tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README-CN.md b/README-CN.md index eea73bde1b..64015cc267 100644 --- a/README-CN.md +++ b/README-CN.md @@ -77,7 +77,7 @@ taosTools 是用于 TDengine 的辅助工具软件集合。目前它包含 taosB 为了在 Ubuntu/Debian 系统上编译 [taos-tools](https://github.com/taosdata/taos-tools) 需要安装如下软件： ```bash -sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev pkg-config +sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config ``` ### CentOS 7： @@ -121,7 +121,7 @@ sudo dnf install -y maven 为了在 CentOS 上构建 [taosTools](https://github.com/taosdata/taos-tools) 需要安装如下依赖软件 ```bash -sudo yum install zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static +sudo yum install zlib-devel zlib-static xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libatomic-static libstdc++-static ``` 注意：由于 snappy 缺乏 pkg-config 支持 diff --git a/README.md b/README.md index aa944ef75d..247d164301 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ By default, TDengine compiling does not include taosTools. You can use 'cmake .. To build the [taosTools](https://github.com/taosdata/taos-tools) on Ubuntu/Debian, the following packages need to be installed. ```bash -sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev pkg-config +sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config ``` ### CentOS 7 @@ -126,7 +126,7 @@ sudo dnf install -y maven To build the [taosTools](https://github.com/taosdata/taos-tools) on CentOS, the following packages need to be installed. ```bash -sudo yum install zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static +sudo yum install zlib-devel zlib-static xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libatomic-static libstdc++-static ``` Note: Since snappy lacks pkg-config support (refer to [link](https://github.com/google/snappy/pull/86)), it lead a cmake prompt libsnappy not found. But snappy will works well. diff --git a/src/kit/taos-tools b/src/kit/taos-tools index e62c5ea58f..ac691425d9 160000 --- a/src/kit/taos-tools +++ b/src/kit/taos-tools @@ -1 +1 @@ -Subproject commit e62c5ea58f1c0d97c8958a9b793d4930407b0541 +Subproject commit ac691425d9fd1cacd9be7e264271a74e86a17bb3 -- GitLab