Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
61328a2c
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
61328a2c
编写于
12月 05, 2018
作者:
P
proller
提交者:
GitHub
12月 05, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ARM build fixes (#3754)
上级
cba3e9c8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
cmake/find_rdkafka.cmake
cmake/find_rdkafka.cmake
+2
-2
dbms/src/DataStreams/BlockExtraInfoInputStream.h
dbms/src/DataStreams/BlockExtraInfoInputStream.h
+2
-0
libs/libcommon/cmake/find_jemalloc.cmake
libs/libcommon/cmake/find_jemalloc.cmake
+2
-3
未找到文件。
cmake/find_rdkafka.cmake
浏览文件 @
61328a2c
...
@@ -4,7 +4,7 @@ endif ()
...
@@ -4,7 +4,7 @@ endif ()
if
(
ENABLE_RDKAFKA
)
if
(
ENABLE_RDKAFKA
)
if
(
OS_LINUX
)
if
(
OS_LINUX
AND NOT ARCH_ARM
)
option
(
USE_INTERNAL_RDKAFKA_LIBRARY
"Set to FALSE to use system librdkafka instead of the bundled"
${
NOT_UNBUNDLED
}
)
option
(
USE_INTERNAL_RDKAFKA_LIBRARY
"Set to FALSE to use system librdkafka instead of the bundled"
${
NOT_UNBUNDLED
}
)
endif
()
endif
()
...
@@ -31,7 +31,7 @@ if (RDKAFKA_LIB AND RDKAFKA_INCLUDE_DIR)
...
@@ -31,7 +31,7 @@ if (RDKAFKA_LIB AND RDKAFKA_INCLUDE_DIR)
if
(
LZ4_LIBRARY
)
if
(
LZ4_LIBRARY
)
list
(
APPEND RDKAFKA_LIBRARY
${
LZ4_LIBRARY
}
)
list
(
APPEND RDKAFKA_LIBRARY
${
LZ4_LIBRARY
}
)
endif
()
endif
()
elseif
(
NOT MISSING_INTERNAL_RDKAFKA_LIBRARY
)
elseif
(
NOT MISSING_INTERNAL_RDKAFKA_LIBRARY
AND NOT ARCH_ARM
)
set
(
USE_INTERNAL_RDKAFKA_LIBRARY 1
)
set
(
USE_INTERNAL_RDKAFKA_LIBRARY 1
)
set
(
RDKAFKA_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/librdkafka/src"
)
set
(
RDKAFKA_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/librdkafka/src"
)
set
(
RDKAFKA_LIBRARY rdkafka
)
set
(
RDKAFKA_LIBRARY rdkafka
)
...
...
dbms/src/DataStreams/BlockExtraInfoInputStream.h
浏览文件 @
61328a2c
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
namespace
DB
namespace
DB
{
{
class
BlockExtraInfo
;
/** Adds to one stream additional block information that is specified
/** Adds to one stream additional block information that is specified
* as the constructor parameter.
* as the constructor parameter.
*/
*/
...
...
libs/libcommon/cmake/find_jemalloc.cmake
浏览文件 @
61328a2c
...
@@ -5,14 +5,13 @@ else ()
...
@@ -5,14 +5,13 @@ else ()
endif
()
endif
()
option
(
ENABLE_JEMALLOC
"Set to TRUE to use jemalloc"
${
ENABLE_JEMALLOC_DEFAULT
}
)
option
(
ENABLE_JEMALLOC
"Set to TRUE to use jemalloc"
${
ENABLE_JEMALLOC_DEFAULT
}
)
if
(
OS_LINUX
)
if
(
OS_LINUX
AND NOT ARCH_ARM
)
option
(
USE_INTERNAL_JEMALLOC_LIBRARY
"Set to FALSE to use system jemalloc library instead of bundled"
${
NOT_UNBUNDLED
}
)
option
(
USE_INTERNAL_JEMALLOC_LIBRARY
"Set to FALSE to use system jemalloc library instead of bundled"
${
NOT_UNBUNDLED
}
)
elseif
()
elseif
()
option
(
USE_INTERNAL_JEMALLOC_LIBRARY
"Set to FALSE to use system jemalloc library instead of bundled"
OFF
)
option
(
USE_INTERNAL_JEMALLOC_LIBRARY
"Set to FALSE to use system jemalloc library instead of bundled"
OFF
)
endif
()
endif
()
if
(
ENABLE_JEMALLOC
)
if
(
ENABLE_JEMALLOC
)
if
(
USE_INTERNAL_JEMALLOC_LIBRARY AND NOT EXISTS
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc/src/jemalloc.c"
)
if
(
USE_INTERNAL_JEMALLOC_LIBRARY AND NOT EXISTS
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc/src/jemalloc.c"
)
message
(
WARNING
"submodule contrib/jemalloc is missing. to fix try run:
\n
git submodule update --init --recursive"
)
message
(
WARNING
"submodule contrib/jemalloc is missing. to fix try run:
\n
git submodule update --init --recursive"
)
set
(
USE_INTERNAL_JEMALLOC_LIBRARY 0
)
set
(
USE_INTERNAL_JEMALLOC_LIBRARY 0
)
...
@@ -23,7 +22,7 @@ if (ENABLE_JEMALLOC)
...
@@ -23,7 +22,7 @@ if (ENABLE_JEMALLOC)
find_package
(
JeMalloc
)
find_package
(
JeMalloc
)
endif
()
endif
()
if
((
NOT JEMALLOC_LIBRARIES OR NOT JEMALLOC_INCLUDE_DIR
)
AND NOT MISSING_INTERNAL_JEMALLOC_LIBRARY
)
if
((
NOT JEMALLOC_LIBRARIES OR NOT JEMALLOC_INCLUDE_DIR
)
AND NOT MISSING_INTERNAL_JEMALLOC_LIBRARY
AND NOT ARCH_ARM
)
set
(
JEMALLOC_LIBRARIES
"jemalloc"
)
set
(
JEMALLOC_LIBRARIES
"jemalloc"
)
set
(
JEMALLOC_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc-cmake/include"
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc-cmake/include_linux_x86_64"
)
set
(
JEMALLOC_INCLUDE_DIR
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc-cmake/include"
"
${
ClickHouse_SOURCE_DIR
}
/contrib/jemalloc-cmake/include_linux_x86_64"
)
set
(
USE_INTERNAL_JEMALLOC_LIBRARY 1
)
set
(
USE_INTERNAL_JEMALLOC_LIBRARY 1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录