Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
5d08a7b3
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,发现更多精彩内容 >>
提交
5d08a7b3
编写于
9月 17, 2019
作者:
P
proller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove gcc-7 from build scripts
上级
01519522
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
18 addition
and
17 deletion
+18
-17
contrib/libunwind-cmake/CMakeLists.txt
contrib/libunwind-cmake/CMakeLists.txt
+1
-0
debian/.pbuilderrc
debian/.pbuilderrc
+3
-4
debian/changelog
debian/changelog
+2
-2
debian/control
debian/control
+1
-1
debian/pbuilder-hooks/C99kill-make
debian/pbuilder-hooks/C99kill-make
+1
-1
debian/rules
debian/rules
+3
-0
libs/libglibc-compatibility/CMakeLists.txt
libs/libglibc-compatibility/CMakeLists.txt
+2
-2
release
release
+3
-3
utils/build/build_debian.sh
utils/build/build_debian.sh
+1
-3
utils/build/build_macos.sh
utils/build/build_macos.sh
+1
-1
未找到文件。
contrib/libunwind-cmake/CMakeLists.txt
浏览文件 @
5d08a7b3
...
...
@@ -4,6 +4,7 @@ set(LIBUNWIND_CXX_SOURCES
${
LIBUNWIND_SOURCE_DIR
}
/src/libunwind.cpp
${
LIBUNWIND_SOURCE_DIR
}
/src/Unwind-EHABI.cpp
${
LIBUNWIND_SOURCE_DIR
}
/src/Unwind-seh.cpp
)
if
(
APPLE
)
set
(
LIBUNWIND_CXX_SOURCES
${
LIBUNWIND_CXX_SOURCES
}
${
LIBUNWIND_SOURCE_DIR
}
/src/Unwind_AppleExtras.cpp
)
endif
()
...
...
debian/.pbuilderrc
浏览文件 @
5d08a7b3
...
...
@@ -11,11 +11,10 @@
# sudo ln -s gutsy /usr/share/debootstrap/scripts/bionic
# sudo ln -s sid /usr/share/debootstrap/scripts/buster
# build ubuntu:
# sudo DIST=trusty pbuilder create --configfile debian/.pbuilderrc && DIST=trusty pdebuild --configfile debian/.pbuilderrc
# sudo DIST=xenial pbuilder create --configfile debian/.pbuilderrc && DIST=xenial pdebuild --configfile debian/.pbuilderrc
# sudo DIST=zesty pbuilder create --configfile debian/.pbuilderrc && DIST=zesty pdebuild --configfile debian/.pbuilderrc
# sudo DIST=artful pbuilder create --configfile debian/.pbuilderrc && DIST=artful pdebuild --configfile debian/.pbuilderrc
# sudo DIST=bionic pbuilder create --configfile debian/.pbuilderrc && DIST=bionic pdebuild --configfile debian/.pbuilderrc
# sudo DIST=cosmic pbuilder create --configfile debian/.pbuilderrc && DIST=cosmic pdebuild --configfile debian/.pbuilderrc
# sudo DIST=disco pbuilder create --configfile debian/.pbuilderrc && DIST=disco pdebuild --configfile debian/.pbuilderrc
# sudo DIST=eoan pbuilder create --configfile debian/.pbuilderrc && DIST=eoan pdebuild --configfile debian/.pbuilderrc
# sudo DIST=devel pbuilder create --configfile debian/.pbuilderrc && DIST=devel pdebuild --configfile debian/.pbuilderrc
# build debian:
# sudo DIST=stable pbuilder create --configfile debian/.pbuilderrc && DIST=stable pdebuild --configfile debian/.pbuilderrc
...
...
debian/changelog
浏览文件 @
5d08a7b3
clickhouse (19.15.1
.1
) unstable; urgency=low
clickhouse (19.15.1) unstable; urgency=low
* Modified source code
--
clickhouse-release <clickhouse-release@yandex-team.ru> Fri, 06 Sep 2019 17:58:30
+0300
--
proller <proller@yandex-team.ru> Wed, 11 Sep 2019 15:54:44
+0300
debian/control
浏览文件 @
5d08a7b3
...
...
@@ -5,7 +5,7 @@ Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
Build-Depends: debhelper (>= 9),
cmake | cmake3,
ninja-build,
gcc-
7 [amd64 i386] | gcc-8 [amd64 i386] | gcc-9 [amd64 i386], g++-7 [amd64 i386] | g++-8 [amd64 i386] | g++-9
[amd64 i386],
gcc-
9 [amd64 i386] | gcc-8 [amd64 i386], g++-9 [amd64 i386] | g++-8
[amd64 i386],
clang-8 [arm64 armhf] | clang-7 [arm64 armhf] | clang-6.0 [arm64 armhf],
libc6-dev,
libicu-dev,
...
...
debian/pbuilder-hooks/C99kill-make
浏览文件 @
5d08a7b3
...
...
@@ -2,4 +2,4 @@
# Try stop parallel build after timeout
killall make gcc gcc-
7 g++-7 gcc-8 g++-8 clang clang-5.0 clang++-5.0
clang-6.0 clang++-6.0 clang-7 clang++-7
||
:
killall make gcc gcc-
8 g++-8 gcc-9 g++-9 clang
clang-6.0 clang++-6.0 clang-7 clang++-7
||
:
debian/rules
浏览文件 @
5d08a7b3
...
...
@@ -32,6 +32,9 @@ endif
CMAKE_FLAGS
+=
-DENABLE_UTILS
=
0
DEB_CC
?=
$(
shell
which gcc-9 gcc-8 gcc |
head
-n1
)
DEB_CXX
?=
$(
shell
which g++-9 g++-8 g++ |
head
-n1
)
ifdef
DEB_CXX
DEB_BUILD_GNU_TYPE
:=
$(
shell
dpkg-architecture
-qDEB_BUILD_GNU_TYPE
)
DEB_HOST_GNU_TYPE
:=
$(
shell
dpkg-architecture
-qDEB_HOST_GNU_TYPE
)
...
...
libs/libglibc-compatibility/CMakeLists.txt
浏览文件 @
5d08a7b3
...
...
@@ -27,8 +27,8 @@ if (GLIBC_COMPATIBILITY)
target_include_directories
(
glibc-compatibility PRIVATE libcxxabi
)
if
(
USE_STATIC_LIBRARIES=0 AND MAKE_STATIC_LIBRARIES=OFF
)
target_compile_options
(
PRIVATE -fPIC
)
if
(
NOT USE_STATIC_LIBRARIES AND NOT MAKE_STATIC_LIBRARIES
)
target_compile_options
(
glibc-compatibility
PRIVATE -fPIC
)
endif
()
target_link_libraries
(
global-libs INTERFACE glibc-compatibility
)
...
...
release
浏览文件 @
5d08a7b3
...
...
@@ -66,7 +66,7 @@ do
shift
elif
[[
$1
==
'--fast'
]]
;
then
# Wrong but fast pbuilder mode: create base package with all depends
EXTRAPACKAGES
=
"
$EXTRAPACKAGES
debhelper cmake ninja-build gcc-
7 g++-7
libc6-dev libicu-dev libreadline-dev psmisc bash expect python python-lxml python-termcolor python-requests curl perl sudo openssl netcat-openbsd"
EXTRAPACKAGES
=
"
$EXTRAPACKAGES
debhelper cmake ninja-build gcc-
8 g++-8
libc6-dev libicu-dev libreadline-dev psmisc bash expect python python-lxml python-termcolor python-requests curl perl sudo openssl netcat-openbsd"
shift
elif
[[
$1
==
'--rpm'
]]
;
then
MAKE_RPM
=
1
...
...
@@ -116,8 +116,8 @@ echo -e "\nCurrent version is $VERSION_STRING"
if
[
-z
"
$NO_BUILD
"
]
;
then
gen_changelog
"
$VERSION_STRING
"
""
"
$AUTHOR
"
""
if
[
-z
"
$USE_PBUILDER
"
]
;
then
DEB_CC
=
${
DEB_CC
:
=
`
which gcc-
7
gcc-8 gcc |
head
-n1
`
}
DEB_CXX
=
${
DEB_CXX
:
=
`
which g++-
7
g++-8 g++ |
head
-n1
`
}
DEB_CC
=
${
DEB_CC
:
=
`
which gcc-
9
gcc-8 gcc |
head
-n1
`
}
DEB_CXX
=
${
DEB_CXX
:
=
`
which g++-
9
g++-8 g++ |
head
-n1
`
}
# Build (only binary packages).
debuild
--preserve-env
-e
PATH
\
-e
DEB_CC
=
$DEB_CC
-e
DEB_CXX
=
$DEB_CXX
-e
CMAKE_FLAGS
=
"
$CMAKE_FLAGS
"
\
...
...
utils/build/build_debian.sh
浏览文件 @
5d08a7b3
...
...
@@ -6,9 +6,7 @@
# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_debian.sh | sh
# install compiler and libs
sudo
apt
install
-y
git bash cmake ninja-build libicu-dev libreadline-dev gperf
sudo
apt
install
-y
gcc-9 g++-9
||
:
[
-z
`
which g++-9
`
]
&&
sudo
apt
install
-y
gcc-8 g++-8
||
:
sudo
apt
install
-y
git bash cmake ninja-build gcc-8 g++-8 libicu-dev libreadline-dev gperf
# for -DUNBUNDLED=1 mode:
#sudo apt install -y libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev zlib1g-dev liblz4-dev libdouble-conversion-dev libzstd-dev libre2-dev libsparsehash-dev librdkafka-dev libcapnp-dev libpoco-dev libsparsehash-dev libgoogle-perftools-dev libunwind-dev googletest libcctz-dev
...
...
utils/build/build_macos.sh
浏览文件 @
5d08a7b3
...
...
@@ -37,7 +37,7 @@ fi
mkdir
build
cd
build
cmake ..
-DCMAKE_CXX_COMPILER
=
`
which g++-9 g++-8
g++-7
`
-DCMAKE_C_COMPILER
=
`
which gcc-9 gcc-8 gcc-7
`
cmake ..
-DCMAKE_CXX_COMPILER
=
`
which g++-9 g++-8
`
-DCMAKE_C_COMPILER
=
`
which gcc-9 gcc-8
`
cmake
--build
.
cd
..
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录