未验证 提交 f6e432b4 编写于 作者: sangshuduo's avatar sangshuduo 提交者: GitHub

fix: taosdump atomic for2.6 (#18782)

* fix: taos-tools link atomic static for 2.6

* empty commit

* fix: update taos-tools
上级 9ec0b144
...@@ -77,7 +77,7 @@ taosTools 是用于 TDengine 的辅助工具软件集合。目前它包含 taosB ...@@ -77,7 +77,7 @@ taosTools 是用于 TDengine 的辅助工具软件集合。目前它包含 taosB
为了在 Ubuntu/Debian 系统上编译 [taos-tools](https://github.com/taosdata/taos-tools) 需要安装如下软件: 为了在 Ubuntu/Debian 系统上编译 [taos-tools](https://github.com/taosdata/taos-tools) 需要安装如下软件:
```bash ```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: ### CentOS 7:
...@@ -121,7 +121,7 @@ sudo dnf install -y maven ...@@ -121,7 +121,7 @@ sudo dnf install -y maven
为了在 CentOS 上构建 [taosTools](https://github.com/taosdata/taos-tools) 需要安装如下依赖软件 为了在 CentOS 上构建 [taosTools](https://github.com/taosdata/taos-tools) 需要安装如下依赖软件
```bash ```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 支持 注意:由于 snappy 缺乏 pkg-config 支持
......
...@@ -79,7 +79,7 @@ By default, TDengine compiling does not include taosTools. You can use 'cmake .. ...@@ -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. To build the [taosTools](https://github.com/taosdata/taos-tools) on Ubuntu/Debian, the following packages need to be installed.
```bash ```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 ### CentOS 7
...@@ -126,7 +126,7 @@ sudo dnf install -y maven ...@@ -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. To build the [taosTools](https://github.com/taosdata/taos-tools) on CentOS, the following packages need to be installed.
```bash ```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. 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.
......
Subproject commit e62c5ea58f1c0d97c8958a9b793d4930407b0541 Subproject commit ac691425d9fd1cacd9be7e264271a74e86a17bb3
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册