[clickhouse-cpp] Update to 2.2.1 #27250
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a2261f65ea979eebf56074f604776160f0074b09 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 04d0d69..c887c93 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1461,7 +1461,7 @@
"port-version": 0
},
"clickhouse-cpp": {
- "baseline": "1.5.0",
+ "baseline": "2.2.1",
"port-version": 0
},
"clipboardxx": {
diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json
index 12cd74c..8ae8c93 100644
--- a/versions/c-/clickhouse-cpp.json
+++ b/versions/c-/clickhouse-cpp.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "90aced24aa802d7fbf38a02640fc5462e34bca17",
+ "version": "2.2.1",
+ "port-version": 0
+ },
{
"git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b",
"version": "1.5.0",
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a2261f65ea979eebf56074f604776160f0074b09 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 04d0d69..c887c93 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1461,7 +1461,7 @@
"port-version": 0
},
"clickhouse-cpp": {
- "baseline": "1.5.0",
+ "baseline": "2.2.1",
"port-version": 0
},
"clipboardxx": {
diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json
index 12cd74c..1071dfd 100644
--- a/versions/c-/clickhouse-cpp.json
+++ b/versions/c-/clickhouse-cpp.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f5c51003b303f90b6041a1b6d1a03ba38821d964",
+ "version": "2.2.1",
+ "port-version": 0
+ },
{
"git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b",
"version": "1.5.0",
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a2261f65ea979eebf56074f604776160f0074b09 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 04d0d69..c887c93 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1461,7 +1461,7 @@
"port-version": 0
},
"clickhouse-cpp": {
- "baseline": "1.5.0",
+ "baseline": "2.2.1",
"port-version": 0
},
"clipboardxx": {
diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json
index 12cd74c..ebbb107 100644
--- a/versions/c-/clickhouse-cpp.json
+++ b/versions/c-/clickhouse-cpp.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "a8187dd4bd1a2e697a5beb4cc7d090b324247c62",
+ "version": "2.2.1",
+ "port-version": 0
+ },
{
"git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b",
"version": "1.5.0",
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a2261f65ea979eebf56074f604776160f0074b09 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 04d0d69..c887c93 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1461,7 +1461,7 @@
"port-version": 0
},
"clickhouse-cpp": {
- "baseline": "1.5.0",
+ "baseline": "2.2.1",
"port-version": 0
},
"clipboardxx": {
diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json
index 12cd74c..514ec52 100644
--- a/versions/c-/clickhouse-cpp.json
+++ b/versions/c-/clickhouse-cpp.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "fac42e3bfb92261e7cef05b70b9c955046f8a317",
+ "version": "2.2.1",
+ "port-version": 0
+ },
{
"git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b",
"version": "1.5.0",
Thomas1664
commented
Oct 16, 2022
Comment on lines
+1
to
+3
| if(VCPKG_TARGET_IS_WINDOWS) | ||
| vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
| endif() |
There was a problem hiding this comment.
Abseil does not dll_export class absl::int128 __cdecl absl::operator/(class absl::int128,class absl::int128):
LINK Pass 1: command "C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1433~1.316\bin\Hostx64\x64\link.exe clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\compressed.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\input.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\output.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\platform.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\socket.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\base\wire_format.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\array.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\column.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\date.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\decimal.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\enum.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\factory.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\ip4.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\ip6.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\lowcardinality.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\nullable.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\numeric.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\string.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\tuple.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\uuid.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\columns\itemview.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\types\type_parser.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\types\types.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\block.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\client.cpp.obj clickhouse\CMakeFiles\clickhouse-cpp-lib.dir\query.cpp.obj /out:clickhouse\clickhouse-cpp-lib.dll /implib:clickhouse\clickhouse-cpp-lib.lib /pdb:clickhouse\clickhouse-cpp-lib.pdb /dll /version:0.0 /machine:x64 /nologo /debug /INCREMENTAL D:\installed\x64-windows\debug\lib\cityhash.lib D:\installed\x64-windows\debug\lib\lz4d.lib wsock32.lib ws2_32.lib D:\installed\x64-windows\debug\lib\abseil_dll.lib -ignore:4221 kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:clickhouse\CMakeFiles\clickhouse-cpp-lib.dir/intermediate.manifest clickhouse\CMakeFiles\clickhouse-cpp-lib.dir/manifest.res" failed (exit code 1120) with the following output:
decimal.cpp.obj : error LNK2019: unresolved external symbol "class absl::int128 __cdecl absl::operator/(class absl::int128,class absl::int128)" (??Kabsl@@YA?AVint128@0@V10@0@Z) referenced in function "bool __cdecl `anonymous namespace'::mulOverflow<int>(class absl::int128 const &,int const &,class absl::int128 *)" (??$mulOverflow@H@?A0xd80ac12a@@YA_NAEBVint128@absl@@AEBHPEAV12@@Z)
clickhouse\clickhouse-cpp-lib.dll : fatal error LNK1120: 1 unresolved externals
Thomas1664
commented
Oct 16, 2022
| "cityhash", | ||
| "lz4", | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", |
There was a problem hiding this comment.
Port doesn't provide CMake config files
Thomas1664
commented
Oct 16, 2022
| fix-error-C4996.patch #fix x64-uwp error:std::uncaught_exception() is deprecated in C++17 | ||
| PATCHES | ||
| fix-deps-and-build-type.patch | ||
| fix-uwp.patch |
There was a problem hiding this comment.
fix-uwp.patch fixes
D:\buildtrees\clickhouse-cpp\src\v2.2.1-26f006ec81.clean\clickhouse\base\socket.cpp(30): error C2664: 'DWORD FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list *)': cannot convert argument 5 from 'char [255]' to 'LPWSTR'
D:\buildtrees\clickhouse-cpp\src\v2.2.1-26f006ec81.clean\clickhouse\base\socket.cpp(30): note: Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or parenthesized function-style cast
C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\winbase.h(2476): note: see declaration of 'FormatMessageW'
There was a problem hiding this comment.
Does this error fixed by upstream?
There was a problem hiding this comment.
This error exists at upstream's master as well: https://github.com/ClickHouse/clickhouse-cpp/blob/master/clickhouse/base/socket.cpp#L30
There was a problem hiding this comment.
Could you also submit an issue or PR on upstream to fix this issue?
There was a problem hiding this comment.
Upstream PR: ClickHouse/clickhouse-cpp#230
Thomas1664
commented
Oct 16, 2022
Comment on lines
-9
to
-11
| +if (MSVC) | ||
| + add_compile_options(/wd4996) | ||
| +endif() |
There was a problem hiding this comment.
No C4996 generated anymore
Thomas1664
commented
Oct 16, 2022
Comment on lines
-9
to
-13
| -inline bool getSignBit(const T & v) | ||
| +inline bool getSignBit(const T & (long double v)) | ||
| { | ||
| return std::signbit(v); | ||
| } |
There was a problem hiding this comment.
LilyWangLL
added
category:port-update
LilyWangLL
approved these changes
Oct 18, 2022
BillyONeal
reviewed
Oct 19, 2022
| LIST(APPEND clickhouse-cpp-lib-src base/sslsocket.cpp) | ||
| ENDIF () | ||
|
|
||
| -ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src}) |
There was a problem hiding this comment.
I was going to push a change that minimized this patch: the indenting of this to be inside the BUILD_SHARED_LIBS was unnecessary. However, the TARGET_LINK_LIBRARIES are also different, so it made sense to leave this alone.
Thanks for your contribution to vcpkg!
BillyONeal
added a commit
to BillyONeal/vcpkg
that referenced
this pull request
Nov 1, 2022
…0-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge. @dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672 This is an audit of everything merged in that time and whether it needs to gain that. microsoft#27561 No VERSION microsoft#27525 No VERSION microsoft#27554 Already has vcpkg_minimum_required microsoft#27536 No VERSION microsoft#27562 No VERSION microsoft#24914 Fixed here microsoft#27547 No VERSION microsoft#27502 No VERSION microsoft#27497 No VERSION microsoft#27317 No VERSION microsoft#27288 No VERSION microsoft#27509 No VERSION microsoft#27504 No VERSION microsoft#27514 No VERSION microsoft#27501 No VERSION microsoft#27495 No VERSION microsoft#27488 No VERSION microsoft#27499 No VERSION microsoft#27378 No VERSION microsoft#27376 Fixed here microsoft#27373 No VERSION microsoft#27045 No VERSION microsoft#27521 No VERSION microsoft#27453 No VERSION microsoft#27481 No VERSION microsoft#27511 No VERSION microsoft#27490 No VERSION microsoft#27510 No VERSION microsoft#27496 No VERSION microsoft#27503 No VERSION microsoft#27485 No VERSION microsoft#27484 No VERSION microsoft#27483 No VERSION microsoft#27459 No VERSION microsoft#27369 No VERSION microsoft#27489 No VERSION microsoft#26594 No VERSION microsoft#27465 No VERSION microsoft#27456 No VERSION microsoft#27425 No VERSION microsoft#27464 Fixed here microsoft#27406 No VERSION microsoft#27398 No VERSION microsoft#27240 No VERSION microsoft#27450 No VERSION microsoft#27463 No VERSION microsoft#27462 No VERSION microsoft#27448 No VERSION microsoft#27440 No VERSION microsoft#27435 No VERSION microsoft#27424 No VERSION microsoft#27414 No VERSION microsoft#27412 No VERSION microsoft#27380 No VERSION microsoft#27343 No VERSION microsoft#27342 No VERSION microsoft#27367 No VERSION microsoft#27226 No VERSION microsoft#27320 No VERSION microsoft#26923 No VERSION microsoft#27284 No VERSION microsoft#27433 No VERSION microsoft#27314 VERSION got *removed* microsoft#27335 No VERSION microsoft#27370 No VERSION microsoft#27324 No VERSION microsoft#27391 No VERSION microsoft#27388 No VERSION microsoft#27396 No VERSION microsoft#27404 No VERSION microsoft#27413 No VERSION microsoft#27417 No VERSION microsoft#27427 No VERSION microsoft#27428 No VERSION microsoft#27368 No VERSION microsoft#27307 No VERSION microsoft#27415 Fixed here. microsoft#27371 Fixed here. microsoft#27323 No VERSION microsoft#27352 No VERSION microsoft#27347 No VERSION microsoft#27366 No VERSION microsoft#27361 No VERSION microsoft#27359 No VERSION microsoft#27358 No VERSION microsoft#27355 No VERSION microsoft#27331 No VERSION microsoft#24615 No VERSION microsoft#27325 No VERSION microsoft#24861 No VERSION microsoft#27354 No VERSION microsoft#27346 No VERSION microsoft#27345 No VERSION microsoft#27218 No VERSION microsoft#27329 No VERSION microsoft#27326 No VERSION microsoft#27321 No VERSION microsoft#27312 No VERSION microsoft#27297 No VERSION microsoft#27336 No VERSION microsoft#27225 No VERSION microsoft#27339 No VERSION microsoft#27302 No VERSION microsoft#27295 No VERSION microsoft#27233 No VERSION microsoft#27313 No VERSION microsoft#27237 No VERSION microsoft#27250 No VERSION microsoft#27263 No VERSION microsoft#27266 No VERSION microsoft#27272 No VERSION microsoft#27287 No VERSION microsoft#27282 No VERSION microsoft#27294 No VERSION microsoft#27228 No VERSION microsoft#27163 No VERSION microsoft#26817 No VERSION microsoft#27286 No VERSION microsoft#27274 No VERSION microsoft#27276 No VERSION microsoft#27232 No VERSION microsoft#27221 No VERSION microsoft#27215 No VERSION microsoft#27166 No VERSION microsoft#27239 No VERSION microsoft#27246 No VERSION microsoft#27268 No VERSION microsoft#27259 No VERSION microsoft#27238 No VERSION microsoft#27224 No VERSION microsoft#27203 No VERSION microsoft#27124 No VERSION
JavierMatosD
pushed a commit
that referenced
this pull request
Nov 8, 2022
* When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge. @dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672 This is an audit of everything merged in that time and whether it needs to gain that. #27561 No VERSION #27525 No VERSION #27554 Already has vcpkg_minimum_required #27536 No VERSION #27562 No VERSION #24914 Fixed here #27547 No VERSION #27502 No VERSION #27497 No VERSION #27317 No VERSION #27288 No VERSION #27509 No VERSION #27504 No VERSION #27514 No VERSION #27501 No VERSION #27495 No VERSION #27488 No VERSION #27499 No VERSION #27378 No VERSION #27376 Fixed here #27373 No VERSION #27045 No VERSION #27521 No VERSION #27453 No VERSION #27481 No VERSION #27511 No VERSION #27490 No VERSION #27510 No VERSION #27496 No VERSION #27503 No VERSION #27485 No VERSION #27484 No VERSION #27483 No VERSION #27459 No VERSION #27369 No VERSION #27489 No VERSION #26594 No VERSION #27465 No VERSION #27456 No VERSION #27425 No VERSION #27464 Fixed here #27406 No VERSION #27398 No VERSION #27240 No VERSION #27450 No VERSION #27463 No VERSION #27462 No VERSION #27448 No VERSION #27440 No VERSION #27435 No VERSION #27424 No VERSION #27414 No VERSION #27412 No VERSION #27380 No VERSION #27343 No VERSION #27342 No VERSION #27367 No VERSION #27226 No VERSION #27320 No VERSION #26923 No VERSION #27284 No VERSION #27433 No VERSION #27314 VERSION got *removed* #27335 No VERSION #27370 No VERSION #27324 No VERSION #27391 No VERSION #27388 No VERSION #27396 No VERSION #27404 No VERSION #27413 No VERSION #27417 No VERSION #27427 No VERSION #27428 No VERSION #27368 No VERSION #27307 No VERSION #27415 Fixed here. #27371 Fixed here. #27323 No VERSION #27352 No VERSION #27347 No VERSION #27366 No VERSION #27361 No VERSION #27359 No VERSION #27358 No VERSION #27355 No VERSION #27331 No VERSION #24615 No VERSION #27325 No VERSION #24861 No VERSION #27354 No VERSION #27346 No VERSION #27345 No VERSION #27218 No VERSION #27329 No VERSION #27326 No VERSION #27321 No VERSION #27312 No VERSION #27297 No VERSION #27336 No VERSION #27225 No VERSION #27339 No VERSION #27302 No VERSION #27295 No VERSION #27233 No VERSION #27313 No VERSION #27237 No VERSION #27250 No VERSION #27263 No VERSION #27266 No VERSION #27272 No VERSION #27287 No VERSION #27282 No VERSION #27294 No VERSION #27228 No VERSION #27163 No VERSION #26817 No VERSION #27286 No VERSION #27274 No VERSION #27276 No VERSION #27232 No VERSION #27221 No VERSION #27215 No VERSION #27166 No VERSION #27239 No VERSION #27246 No VERSION #27268 No VERSION #27259 No VERSION #27238 No VERSION #27224 No VERSION #27203 No VERSION #27124 No VERSION * Also add libcanberra
This was referenced Apr 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the pull request
What does your PR fix?
Update to 2.2.1Use dependencies via vcpkg
Add feature openssl
Don't build static and shared libs at the same time