Commit Graph

1330 Commits

Author SHA1 Message Date
alexey-milovidov
d3a9389465
Merge branch 'master' into bharatnc-ncb/timezones-table 2020-08-26 04:26:37 +03:00
alexey-milovidov
f904664742
Merge pull request #14063 from azat/bump-zlib-ng-gcc10
Bump zlib-ng (to fix gcc10 build)
2020-08-26 03:40:53 +03:00
Alexey Milovidov
7799cc37ca Fix build 2020-08-26 02:19:50 +03:00
Alexey Milovidov
63feb75306 Some tweaks 2020-08-25 23:49:22 +03:00
Azat Khuzhin
9971cf2eff Bump zlib-ng (to fix gcc10 build)
[1] is required for gcc10 build, due to incorrect `static_ltree` declaration:

    ld.lld: error: duplicate symbol: static_ltree
    >>> defined at trees.h:6 (../contrib/zlib-ng/trees.h:6)
    >>>            trees.c.o:(static_ltree) in archive contrib/zlib-ng/libzlib.a
    >>> defined at deflate_quick.c:168 (../contrib/zlib-ng/arch/x86/deflate_quick.c:168)
    >>>            deflate_quick.c.o:(.rodata+0x0) in archive contrib/zlib-ng/libzlib.a
    collect2: error: ld returned 1 exit status
    ninja: build stopped: subcommand failed.

  [1]: https://github.com/ClickHouse-Extras/zlib-ng/pull/2
2020-08-25 22:31:19 +03:00
Konstantin Podshumok
e296997b6c
cmake: fix potential curl linking problems
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:44 +03:00
Konstantin Podshumok
68a921cdea
cmake: use bundled rdkafaka for in unbundled tests for now
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
5097793872
cmake: Fix odbc in unbudled
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
8479da3033
cmake: unbundled protobuf: don't expect old c++ API by default
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
5d13c1f03f
cmake: unbundled: libxml2 requires liblzma when building static
Squashed:
- fixup hdfs3-libxml2

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
cc6a59d59b
cmake: disable internal ORC when using external Parquet
Squashed:
- fix internal poco linking with `zlib`

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:42 +03:00
Konstantin Podshumok
9af119ea35
cmake: USE_INTERNAL_REPLXX_LIBRARY is ON by default now
As we don't now any system that ships it as a package

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:41 +03:00
Konstantin Podshumok
18fd3e7357
cmake: ARM: make sure cpuid is not enabled by default
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
0ad4b5dea6
cmake: disable jemalloc on alternative arches and with sanitizers
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
3ec7a4bc53
cmake: make sure ENABLE_GRPC is off by default when PROTOBUF is OFF by default
Squashed:
- cmake: make sure protobuf compiler and snappy are there for unbundled build
- cmake: Turn ON internal GRPC library by default until relevant features will be implemented
- cmake: allow unbundled grpc

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
1913522233
cmake: always use internal poco library as it went too far from upstream
Squashed:
- cmake: move USE_INTERNAL_POCO_LIBRARY option to separate file
- point contrib/poco to "add <atomic> to TCPServerDispatcher"

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:38 +03:00
Konstantin Podshumok
87a2ae1820
cmake: contrib/curl-cmake: use FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:38 +03:00
Konstantin Podshumok
d456aa86ef
Revert "Revert "cmake: Add option to fail configuration instead of auto-reconfiguration""
This reverts commit 89419ceb9b
(curl part moved to separate commit)

Squashed:
- termcap removed
- fix for cassandra on apple merged
- cmake: fix "Can't find system zlib library" in unbundled build
- cmake: fix condition when testing for rdkafka platform
- cmake: PROTOBUF_OLD_ABI_COMPAT shouldn't be enabled for internal protobuf

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:37 +03:00
bharatnc
2ef2d0976b spacing, new line at end in .sql and .reference files 2020-08-24 23:30:58 +03:00
bharatnc
d85dba2209 fix more spacing 2020-08-24 23:30:58 +03:00
bharatnc
7a07f13d1a fix vertical spacing 2020-08-24 23:30:58 +03:00
Alexey Milovidov
b504b9a917 Fix conflict + minor modification. 2020-08-24 23:29:56 +03:00
alexey-milovidov
7ea5364299
Merge pull request #13648 from filimonov/tzdata_version2
tzdata improvements
2020-08-24 23:07:37 +03:00
alexey-milovidov
fb0e68f808
Merge pull request #12771 from arenadata/ADQM-109
krb5 + cyrus-sasl + kerberized kafka
2020-08-20 20:13:01 +03:00
Mikhail Filimonov
4eff1a75de one more attempt
objcopy creates symbols from source filenames (can't be ajusted), so just make temp files with needed names
2020-08-14 01:10:21 +02:00
Mikhail Filimonov
fe55ef6b2c Trying to fix TZ with plus sign inside 2020-08-13 23:28:56 +02:00
alexey-milovidov
89419ceb9b
Revert "cmake: Add option to fail configuration instead of auto-reconfiguration" 2020-08-13 23:10:06 +03:00
Mikhail Filimonov
a0ae1b2b42 tzdata improvements
Expose version of embedded tzdata via TZDATA_VERSION in system.build_options.
Autogenerate list of shipped timezones. Script to check tzdb updates.
2020-08-12 14:21:40 +02:00
Vladimir Chebotarev
11c85065ef
Update CMakeLists.txt 2020-08-12 02:05:20 +03:00
Vladimir Chebotarev
fb527e8677
Update CMakeLists.txt 2020-08-12 02:03:53 +03:00
Vladimir Chebotarev
2bcc850533
Update CMakeLists.txt 2020-08-12 02:00:21 +03:00
alexey-milovidov
6afbcfe914
Merge pull request #13528 from ClickHouse/clickhouse-install
Simple clickhouse install script
2020-08-11 18:08:22 +03:00
Alexey Milovidov
c7a6a18a75 Preparation to enable clickhouse install on Mac and FreeBSD 2020-08-10 02:58:09 +03:00
Konstantin Podshumok
262080132b cmake: disabling silent reconfigurations in contrib/*/CMakeLists.txt
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-09 21:37:46 +03:00
Alexey Milovidov
8d616444e4 Support for AArch64 2020-08-09 02:54:38 +03:00
Alexey Milovidov
0f79eb3cc5 Embed configs into binary 2020-08-08 06:42:42 +03:00
Alexey Milovidov
070b43fa35 Update submodule 2020-08-06 04:06:48 +03:00
Alexey Milovidov
4abf9cb6b9 Remove useless submodules from GRPC 2020-08-05 19:44:24 +03:00
Alexey Milovidov
88e772bec3 Update submodules 2020-08-05 17:53:20 +03:00
Alexey Milovidov
4348d6746c Remove submodules 2020-08-05 17:32:23 +03:00
Alexey Milovidov
bf7ae9ef4e Remove recursive submodules from Sentry 2020-08-05 13:48:34 +03:00
Alexey Milovidov
7f18ff16aa Simplify CMake for libunwind (suggestion from @azat) 2020-08-02 17:05:33 +03:00
Alexey Milovidov
14174ba38f Fix warning in libunwind 2020-08-02 06:11:40 +03:00
Alexey Milovidov
f633c59737 Fix warning in libunwind 2020-08-02 06:09:10 +03:00
alexey-milovidov
120092e486
Merge pull request #13208 from ClickHouse/libunwind-register
Allow "register" variables in libunwind
2020-08-02 01:45:06 +03:00
alexey-milovidov
566044f9c8
Merge pull request #12991 from ClickHouse/kafka-fix-msan
Fix MSan error in "rdkafka" library #12990
2020-08-02 00:22:44 +03:00
alexey-milovidov
664b2c10c8
Update CMakeLists.txt 2020-08-01 18:56:50 +03:00
Alexey Milovidov
344d898df3 Allow "register" variables in libunwind 2020-08-01 18:10:47 +03:00
Ilya Golshtein
ff92812ac5 openssl to link with krb5 2020-07-31 13:49:08 +03:00
Ilya Golshtein
09bf3dc0d8 remove odd krb5 files from build 2020-07-31 13:49:08 +03:00