+ case "${usergroup_phase}" in + local run_cmd + run_cmd=run_su + shift + run_su /opt/local/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/clickhouse-23.8.7.24/work.log + su pbulk -c '"$@"' make /opt/local/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/clickhouse-23.8.7.24/work.log => Checksum BLAKE2s OK for 0001-Add-cmake-sunos-default_libs.cmake.patch => Checksum SHA512 OK for 0001-Add-cmake-sunos-default_libs.cmake.patch => Checksum BLAKE2s OK for 0002-Allow-building-clickhouse-with-custom-C-CXX-LD-FLAGS.patch => Checksum SHA512 OK for 0002-Allow-building-clickhouse-with-custom-C-CXX-LD-FLAGS.patch => Checksum BLAKE2s OK for 0003-Disable-thread-safety-analysis.patch => Checksum SHA512 OK for 0003-Disable-thread-safety-analysis.patch => Checksum BLAKE2s OK for 0004-Allow-i386-for-system-processor.patch => Checksum SHA512 OK for 0004-Allow-i386-for-system-processor.patch => Checksum BLAKE2s OK for 0005-utils-Use-GNU-find-grep.patch => Checksum SHA512 OK for 0005-utils-Use-GNU-find-grep.patch => Checksum BLAKE2s OK for 0006-Adjust-log-paths-in-server-config.xml.patch => Checksum SHA512 OK for 0006-Adjust-log-paths-in-server-config.xml.patch => Checksum BLAKE2s OK for 0007-Add-lsocket-and-lnsl-to-poco-link.patch => Checksum SHA512 OK for 0007-Add-lsocket-and-lnsl-to-poco-link.patch => Checksum BLAKE2s OK for 0008-Rename-tokens-due-to-regset.h-pollution.patch => Checksum SHA512 OK for 0008-Rename-tokens-due-to-regset.h-pollution.patch => Checksum BLAKE2s OK for 0009-std-namespace-fixes.patch => Checksum SHA512 OK for 0009-std-namespace-fixes.patch => Checksum BLAKE2s OK for 0010-Missing-includes.patch => Checksum SHA512 OK for 0010-Missing-includes.patch => Checksum BLAKE2s OK for 0011-Enable-SSE2-divide-implementation-on-illumos.patch => Checksum SHA512 OK for 0011-Enable-SSE2-divide-implementation-on-illumos.patch => Checksum BLAKE2s OK for 0012-Cast-arguments-to-FP-functions.patch => Checksum SHA512 OK for 0012-Cast-arguments-to-FP-functions.patch => Checksum BLAKE2s OK for 0013-IBridge-Don-t-set-max-RSS-on-illumos.patch => Checksum SHA512 OK for 0013-IBridge-Don-t-set-max-RSS-on-illumos.patch => Checksum BLAKE2s OK for 0014-More-granular-configuration-of-TCP-keepalives.patch => Checksum SHA512 OK for 0014-More-granular-configuration-of-TCP-keepalives.patch => Checksum BLAKE2s OK for 0015-QueryProfiler-Only-enable-if-OS-supports-it.patch => Checksum SHA512 OK for 0015-QueryProfiler-Only-enable-if-OS-supports-it.patch => Checksum BLAKE2s OK for 0016-illumos-support-for-pollPid.patch => Checksum SHA512 OK for 0016-illumos-support-for-pollPid.patch => Checksum BLAKE2s OK for 0017-Use-statvfs-on-illumos.patch => Checksum SHA512 OK for 0017-Use-statvfs-on-illumos.patch => Checksum BLAKE2s OK for 0018-Do-not-try-to-increase-the-thread-limit-via-proc.patch => Checksum SHA512 OK for 0018-Do-not-try-to-increase-the-thread-limit-via-proc.patch => Checksum BLAKE2s OK for 0020-Use-libunwind-on-illumos.patch => Checksum SHA512 OK for 0020-Use-libunwind-on-illumos.patch => Checksum BLAKE2s OK for 0021-Enable-memory-stats-on-illumos.patch => Checksum SHA512 OK for 0021-Enable-memory-stats-on-illumos.patch => Checksum BLAKE2s OK for 0022-Disable-skim-on-illumos.patch => Checksum SHA512 OK for 0022-Disable-skim-on-illumos.patch => Checksum BLAKE2s OK for 0023-wide_integer-invalid-conversion.patch => Checksum SHA512 OK for 0023-wide_integer-invalid-conversion.patch => Checksum BLAKE2s OK for 0024-Fix-compilation-of-headers-under-C-23.patch => Checksum SHA512 OK for 0024-Fix-compilation-of-headers-under-C-23.patch => Checksum BLAKE2s OK for 0025-DependencyGraph-missing-overloads.patch => Checksum SHA512 OK for 0025-DependencyGraph-missing-overloads.patch => Checksum BLAKE2s OK for 0026-parseLDAPServer-std-optional-emplace-failure.patch => Checksum SHA512 OK for 0026-parseLDAPServer-std-optional-emplace-failure.patch => Checksum BLAKE2s OK for 0027-KeeperStateMachine-std-optional-emplace-failure.patch => Checksum SHA512 OK for 0027-KeeperStateMachine-std-optional-emplace-failure.patch => Checksum BLAKE2s OK for 0028-KeeperStorage-need-to-explicitly-specify-operator-re.patch => Checksum SHA512 OK for 0028-KeeperStorage-need-to-explicitly-specify-operator-re.patch => Checksum BLAKE2s OK for 0029-IPAddressDictionary-use-boost-variant2.patch => Checksum SHA512 OK for 0029-IPAddressDictionary-use-boost-variant2.patch => Checksum BLAKE2s OK for 0030-StorageURL-Trying-to-return-std-tuple-from-function-.patch => Checksum SHA512 OK for 0030-StorageURL-Trying-to-return-std-tuple-from-function-.patch => Checksum BLAKE2s OK for 0031-MergeTree-Use-logf.patch => Checksum SHA512 OK for 0031-MergeTree-Use-logf.patch => Checksum BLAKE2s OK for 0032-Loggers-unresolved-std-time_put.patch => Checksum SHA512 OK for 0032-Loggers-unresolved-std-time_put.patch => Checksum BLAKE2s OK for 0033-config-processor-missing-files-in-link.patch => Checksum SHA512 OK for 0033-config-processor-missing-files-in-link.patch => Checksum BLAKE2s OK for 0034-library-bridge-missing-files-in-link.patch => Checksum SHA512 OK for 0034-library-bridge-missing-files-in-link.patch => Checksum BLAKE2s OK for 0035-Ensure-that-libunwind-is-linked-in-the-final-objects.patch => Checksum SHA512 OK for 0035-Ensure-that-libunwind-is-linked-in-the-final-objects.patch => Checksum BLAKE2s OK for 0036-Restore-poco-SUN-files.patch => Checksum SHA512 OK for 0036-Restore-poco-SUN-files.patch => Checksum BLAKE2s OK for 0037-poco-foundation-add-illumos-support.patch => Checksum SHA512 OK for 0037-poco-foundation-add-illumos-support.patch => Checksum BLAKE2s OK for 0038-contrib-abseil-cpp-Allow-i386-for-system-processor.patch => Checksum SHA512 OK for 0038-contrib-abseil-cpp-Allow-i386-for-system-processor.patch => Checksum BLAKE2s OK for 0039-contrib-abseil-cpp-illumos-does-not-have-VDSO-suppor.patch => Checksum SHA512 OK for 0039-contrib-abseil-cpp-illumos-does-not-have-VDSO-suppor.patch => Checksum BLAKE2s OK for 0040-contrib-azure-Use-arc4random-and-SIGPIPE-on-illumos.patch => Checksum SHA512 OK for 0040-contrib-azure-Use-arc4random-and-SIGPIPE-on-illumos.patch => Checksum BLAKE2s OK for 0041-contrib-azure-forward-declaration-before-unique_ptr.patch => Checksum SHA512 OK for 0041-contrib-azure-forward-declaration-before-unique_ptr.patch => Checksum BLAKE2s OK for 0042-contrib-boost-Rename-tokens-due-to-regset.h-pollutio.patch => Checksum SHA512 OK for 0042-contrib-boost-Rename-tokens-due-to-regset.h-pollutio.patch => Checksum BLAKE2s OK for 0043-contrib-c-ares-add-illumos-as-a-platform.patch => Checksum SHA512 OK for 0043-contrib-c-ares-add-illumos-as-a-platform.patch => Checksum BLAKE2s OK for 0044-contrib-cctz-Fix-char-array-index-warning.patch => Checksum SHA512 OK for 0044-contrib-cctz-Fix-char-array-index-warning.patch => Checksum BLAKE2s OK for 0045-contrib-curl-Add-illumos-support.patch => Checksum SHA512 OK for 0045-contrib-curl-Add-illumos-support.patch => Checksum BLAKE2s OK for 0046-contrib-datasketches-Rename-tokens-due-to-regset.h-p.patch => Checksum SHA512 OK for 0046-contrib-datasketches-Rename-tokens-due-to-regset.h-p.patch => Checksum BLAKE2s OK for 0047-contrib-libarchive-Add-illumos-support.patch => Checksum SHA512 OK for 0047-contrib-libarchive-Add-illumos-support.patch => Checksum BLAKE2s OK for 0048-contrib-libpq-Do-not-use-strerror_r-on-illumos.patch => Checksum SHA512 OK for 0048-contrib-libpq-Do-not-use-strerror_r-on-illumos.patch => Checksum BLAKE2s OK for 0049-contrib-libpq-ignore-pg_attribute_printf.patch => Checksum SHA512 OK for 0049-contrib-libpq-ignore-pg_attribute_printf.patch => Checksum BLAKE2s OK for 0050-contrib-llvm-project-Disable-locale-static-assertion.patch => Checksum SHA512 OK for 0050-contrib-llvm-project-Disable-locale-static-assertion.patch => Checksum BLAKE2s OK for 0051-contrib-llvm-project-Enable-xlocale-for-illumos.patch => Checksum SHA512 OK for 0051-contrib-llvm-project-Enable-xlocale-for-illumos.patch => Checksum BLAKE2s OK for 0052-contrib-llvm-project-Missing-brace-and-prefer-std-ll.patch => Checksum SHA512 OK for 0052-contrib-llvm-project-Missing-brace-and-prefer-std-ll.patch => Checksum BLAKE2s OK for 0053-contrib-llvm-project-Rename-tokens-due-to-regset.h-p.patch => Checksum SHA512 OK for 0053-contrib-llvm-project-Rename-tokens-due-to-regset.h-p.patch => Checksum BLAKE2s OK for 0054-contrib-llvm-project-ignore-__sentinel.patch => Checksum SHA512 OK for 0054-contrib-llvm-project-ignore-__sentinel.patch => Checksum BLAKE2s OK for 0055-contrib-miniselect-cast-argument-to-log.patch => Checksum SHA512 OK for 0055-contrib-miniselect-cast-argument-to-log.patch => Checksum BLAKE2s OK for 0056-contrib-rocksdb-illumos-does-not-have-dirent-d_type-.patch => Checksum SHA512 OK for 0056-contrib-rocksdb-illumos-does-not-have-dirent-d_type-.patch => Checksum BLAKE2s OK for 0057-contrib-rocksdb-re-order-structs-to-fix-compilation-.patch => Checksum SHA512 OK for 0057-contrib-rocksdb-re-order-structs-to-fix-compilation-.patch => Checksum BLAKE2s OK for 0058-contrib-s2geometry-Find-endian.h-on-illumos.patch => Checksum SHA512 OK for 0058-contrib-s2geometry-Find-endian.h-on-illumos.patch => Checksum BLAKE2s OK for 0059-contrib-s2geometry-use-floating-point-parameters-to-.patch => Checksum SHA512 OK for 0059-contrib-s2geometry-use-floating-point-parameters-to-.patch => Checksum BLAKE2s OK for 0060-contrib-s2geometry-using-std-ldexp.patch => Checksum SHA512 OK for 0060-contrib-s2geometry-using-std-ldexp.patch => Checksum BLAKE2s OK for 0061-contrib-zlib-ng-Use-posix_memalign-on-illumos.patch => Checksum SHA512 OK for 0061-contrib-zlib-ng-Use-posix_memalign-on-illumos.patch => Checksum BLAKE2s OK for clickhouse-src-bundle-v23.8.7.24-lts.tar.gz => Checksum SHA512 OK for clickhouse-src-bundle-v23.8.7.24-lts.tar.gz ===> Installing dependencies for clickhouse-23.8.7.24 => Tool dependency findutils-[0-9]*: found findutils-4.9.0 => Tool dependency nasm-[0-9]*: found nasm-2.16.01 => Tool dependency clang-[0-9]*: found clang-19.1.7nb1 => Tool dependency cmake>=0: found cmake-3.31.7nb2 => Tool dependency cwrappers>=20150314: found cwrappers-20220403 => Tool dependency checkperms>=1.1: found checkperms-1.12 ===> Overriding tools for clickhouse-23.8.7.24 ===> Extracting for clickhouse-23.8.7.24 ===> Patching for clickhouse-23.8.7.24 => Applying distribution patches for clickhouse-23.8.7.24 => Applying distribution patch 0001-Add-cmake-sunos-default_libs.cmake.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 4827bdb37b851b95de49d80eb8c2df1ec51d439c Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:30 +0000 |Subject: [PATCH 01/61] Add cmake/sunos/default_libs.cmake | |--- | CMakeLists.txt | 2 ++ | cmake/sunos/default_libs.cmake | 30 ++++++++++++++++++++++++++++++ | 2 files changed, 32 insertions(+) | create mode 100644 cmake/sunos/default_libs.cmake | |diff --git a/CMakeLists.txt b/CMakeLists.txt |index 55bcf5fbf3..eb99926dbc 100644 |--- a/CMakeLists.txt |+++ b/CMakeLists.txt -------------------------- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 388. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/cmake/sunos/default_libs.cmake b/cmake/sunos/default_libs.cmake |new file mode 100644 |index 0000000000..82a6113b05 |--- /dev/null |+++ b/cmake/sunos/default_libs.cmake -------------------------- (Creating file cmake/sunos/default_libs.cmake...) Patching file cmake/sunos/default_libs.cmake using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0002-Allow-building-clickhouse-with-custom-C-CXX-LD-FLAGS.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 1c8e5730f2f32bfc197f3f78bd7f6e3e14223831 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:21 +0000 |Subject: [PATCH 02/61] Allow building clickhouse with custom {C,CXX,LD}FLAGS | |--- | PreLoad.cmake | 11 ----------- | 1 file changed, 11 deletions(-) | |diff --git a/PreLoad.cmake b/PreLoad.cmake |index b456c724cc..9c78b5bc68 100644 |--- a/PreLoad.cmake |+++ b/PreLoad.cmake -------------------------- Patching file PreLoad.cmake using Plan A... Hunk #1 succeeded at 37. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0003-Disable-thread-safety-analysis.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From c392a44481112a450e7deb42715bee9c62b52155 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:39 +0000 |Subject: [PATCH 03/61] Disable thread safety analysis | |--- | cmake/warnings.cmake | 2 ++ | 1 file changed, 2 insertions(+) | |diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake |index 00fa32a6b7..49f07f8ba9 100644 |--- a/cmake/warnings.cmake |+++ b/cmake/warnings.cmake -------------------------- Patching file cmake/warnings.cmake using Plan A... Hunk #1 succeeded at 44. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0004-Allow-i386-for-system-processor.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 59ec2fbea109fe797abd364838db57debefdf944 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:24 +0000 |Subject: [PATCH 04/61] Allow "i386" for system processor. | |--- | cmake/arch.cmake | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/cmake/arch.cmake b/cmake/arch.cmake |index 5ec05e49e3..db2bd27f99 100644 |--- a/cmake/arch.cmake |+++ b/cmake/arch.cmake -------------------------- Patching file cmake/arch.cmake using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0005-utils-Use-GNU-find-grep.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From ec84215573c4e71b6deb25b664b7a74eabeaed9a Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 14:09:30 +0000 |Subject: [PATCH 05/61] utils: Use GNU find / grep | |--- | cmake/tools.cmake | 13 +++++++++++++ | utils/list-licenses/list-licenses.sh | 2 +- | 2 files changed, 14 insertions(+), 1 deletion(-) | |diff --git a/cmake/tools.cmake b/cmake/tools.cmake |index 802907c9dd..e126a9d84e 100644 |--- a/cmake/tools.cmake |+++ b/cmake/tools.cmake -------------------------- Patching file cmake/tools.cmake using Plan A... Hunk #1 succeeded at 161. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh |index cee5cf87a0..8f36e0396e 100755 |--- a/utils/list-licenses/list-licenses.sh |+++ b/utils/list-licenses/list-licenses.sh -------------------------- Patching file utils/list-licenses/list-licenses.sh using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0006-Adjust-log-paths-in-server-config.xml.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 51fca60c4844bb6247ad5cbae8995a85922a48d6 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:38 +0000 |Subject: [PATCH 06/61] Adjust log paths in server config.xml | |--- | programs/server/config.xml | 4 ++-- | 1 file changed, 2 insertions(+), 2 deletions(-) | |diff --git a/programs/server/config.xml b/programs/server/config.xml |index 07052441a0..6f10c552e4 100644 |--- a/programs/server/config.xml |+++ b/programs/server/config.xml -------------------------- Patching file programs/server/config.xml using Plan A... Hunk #1 succeeded at 22. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0007-Add-lsocket-and-lnsl-to-poco-link.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 9191d56e6031bc8e169b010734df27023286bdcd Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:32 +0000 |Subject: [PATCH 07/61] Add -lsocket and -lnsl to poco link | |--- | base/poco/Net/CMakeLists.txt | 4 ++++ | 1 file changed, 4 insertions(+) | |diff --git a/base/poco/Net/CMakeLists.txt b/base/poco/Net/CMakeLists.txt |index 792045c9b4..50ffbdf905 100644 |--- a/base/poco/Net/CMakeLists.txt |+++ b/base/poco/Net/CMakeLists.txt -------------------------- Patching file base/poco/Net/CMakeLists.txt using Plan A... Hunk #1 succeeded at 9. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0008-Rename-tokens-due-to-regset.h-pollution.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From f1ed204807a6b34fa4ba3426f1ebf845efc3edd1 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:12 +0000 |Subject: [PATCH 08/61] Rename tokens due to regset.h pollution | |--- | src/Client/ClientBase.cpp | 6 +++--- | src/Client/ClientBase.h | 2 +- | src/Common/StackTrace.h | 4 ++++ | 3 files changed, 8 insertions(+), 4 deletions(-) | |diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp |index 1924413461..775e9f3e72 100644 |--- a/src/Client/ClientBase.cpp |+++ b/src/Client/ClientBase.cpp -------------------------- Patching file src/Client/ClientBase.cpp using Plan A... Hunk #1 succeeded at 133. Hunk #2 succeeded at 731. Hunk #3 succeeded at 2829. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h |index d877905302..596654232a 100644 |--- a/src/Client/ClientBase.h |+++ b/src/Client/ClientBase.h -------------------------- Patching file src/Client/ClientBase.h using Plan A... Hunk #1 succeeded at 53. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h |index 656f543d83..2d1389f4de 100644 |--- a/src/Common/StackTrace.h |+++ b/src/Common/StackTrace.h -------------------------- Patching file src/Common/StackTrace.h using Plan A... Hunk #1 succeeded at 17. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0009-std-namespace-fixes.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 62cfa4a360e89dee2c0241c102237cd3086440d7 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:57 +0000 |Subject: [PATCH 09/61] std:: namespace fixes | |--- | base/base/preciseExp10.cpp | 2 ++ | src/AggregateFunctions/AggregateFunctionStatisticsSimple.h | 2 ++ | src/Core/ColumnNumbers.h | 1 + | src/Functions/FunctionBase58Conversion.h | 1 + | src/Functions/makeDate.cpp | 2 ++ | src/IO/ISchedulerNode.h | 2 +- | src/IO/ReadBuffer.cpp | 1 + | src/IO/SeekableReadBuffer.cpp | 1 + | src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp | 2 ++ | 9 files changed, 13 insertions(+), 1 deletion(-) | |diff --git a/base/base/preciseExp10.cpp b/base/base/preciseExp10.cpp |index 1cd660dc56..a6f1d40699 100644 |--- a/base/base/preciseExp10.cpp |+++ b/base/base/preciseExp10.cpp -------------------------- Patching file base/base/preciseExp10.cpp using Plan A... Hunk #1 succeeded at 33. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h |index f9a60c0c0b..b1fcfdb8e5 100644 |--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h |+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h -------------------------- Patching file src/AggregateFunctions/AggregateFunctionStatisticsSimple.h using Plan A... Hunk #1 succeeded at 17. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Core/ColumnNumbers.h b/src/Core/ColumnNumbers.h |index 51054435e1..7d09d00640 100644 |--- a/src/Core/ColumnNumbers.h |+++ b/src/Core/ColumnNumbers.h -------------------------- Patching file src/Core/ColumnNumbers.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Functions/FunctionBase58Conversion.h b/src/Functions/FunctionBase58Conversion.h |index ae8cd30959..321e2ffd5b 100644 |--- a/src/Functions/FunctionBase58Conversion.h |+++ b/src/Functions/FunctionBase58Conversion.h -------------------------- Patching file src/Functions/FunctionBase58Conversion.h using Plan A... Hunk #1 succeeded at 9. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp |index 1e4f3604c9..694cbab974 100644 |--- a/src/Functions/makeDate.cpp |+++ b/src/Functions/makeDate.cpp -------------------------- Patching file src/Functions/makeDate.cpp using Plan A... Hunk #1 succeeded at 17. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/IO/ISchedulerNode.h b/src/IO/ISchedulerNode.h |index 1c33c03374..e3cf55431a 100644 |--- a/src/IO/ISchedulerNode.h |+++ b/src/IO/ISchedulerNode.h -------------------------- Patching file src/IO/ISchedulerNode.h using Plan A... Hunk #1 succeeded at 56. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/IO/ReadBuffer.cpp b/src/IO/ReadBuffer.cpp |index bf054d0842..ce312dfc95 100644 |--- a/src/IO/ReadBuffer.cpp |+++ b/src/IO/ReadBuffer.cpp -------------------------- Patching file src/IO/ReadBuffer.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/IO/SeekableReadBuffer.cpp b/src/IO/SeekableReadBuffer.cpp |index b83e382db0..0d40bc107f 100644 |--- a/src/IO/SeekableReadBuffer.cpp |+++ b/src/IO/SeekableReadBuffer.cpp -------------------------- Patching file src/IO/SeekableReadBuffer.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp |index cfaefbe663..0b999df1f1 100644 |--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp |+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp -------------------------- Patching file src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp using Plan A... Hunk #1 succeeded at 6. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0010-Missing-includes.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7392559e1b35b64ffda26c0f06ce34d748f54913 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:21:39 +0000 |Subject: [PATCH 10/61] Missing includes | |--- | base/base/bit_cast.h | 1 + | base/base/find_symbols.h | 3 +++ | base/base/iostream_debug_helpers.h | 2 ++ | base/poco/Net/include/Poco/Net/HTTPSession.h | 1 + | .../inc/azure/storage/common/internal/xml_wrapper.hpp | 1 + | programs/copier/ShardPartition.h | 1 + | programs/copier/ShardPartitionPiece.h | 1 + | src/Access/AccessBackup.h | 1 + | src/Access/DiskAccessStorage.h | 1 + | src/Access/SettingsConstraints.cpp | 1 + | src/Backups/BackupFileInfo.h | 1 + | src/Backups/BackupIO.h | 1 + | src/Backups/BackupStatus.h | 1 + | src/Backups/BackupsWorker.h | 1 + | src/Backups/IBackupCoordination.h | 2 ++ | src/Backups/IRestoreCoordination.h | 2 ++ | src/Backups/RestoreCoordinationLocal.h | 1 + | src/Common/AsyncLoader.h | 1 + | src/Common/CaresPTRResolver.cpp | 1 + | src/Common/ConcurrencyControl.h | 2 ++ | src/Common/FileChecker.h | 1 + | src/Common/ProxyConfigurationResolverProvider.h | 1 + | src/Common/ProxyListConfigurationResolver.h | 1 + | src/Common/RemoteHostFilter.h | 1 + | src/Common/ThreadProfileEvents.h | 3 +++ | src/Common/ZooKeeper/ZooKeeper.h | 1 + | src/Coordination/RaftServerConfig.h | 3 +++ | src/Core/MySQL/MySQLCharset.h | 1 + | src/Disks/DiskType.cpp | 1 + | src/Disks/IO/getThreadPoolReader.h | 2 ++ | .../DiskObjectStorageRemoteMetadataRestoreHelper.cpp | 2 ++ | src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp | 1 + | src/Formats/BSONTypes.h | 1 + | src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h | 1 + | src/IO/HTTPHeaderEntries.h | 1 + | src/IO/ISchedulerNode.h | 1 + | src/Interpreters/InterpreterInsertQuery.h | 1 + | src/Loggers/OwnSplitChannel.h | 1 + | src/Server/waitServersToFinish.h | 1 + | src/Storages/MergeTree/IPartMetadataManager.h | 1 + | src/Storages/NATS/NATSConnection.cpp | 2 ++ | src/Storages/NATS/NATSHandler.cpp | 2 ++ | src/Storages/NATS/NATSHandler.h | 1 + | src/Storages/StorageLogSettings.h | 1 + | 44 files changed, 58 insertions(+) | |diff --git a/base/base/bit_cast.h b/base/base/bit_cast.h |index 4783a84586..0757ccd5c1 100644 |--- a/base/base/bit_cast.h |+++ b/base/base/bit_cast.h -------------------------- Patching file base/base/bit_cast.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/base/find_symbols.h b/base/base/find_symbols.h |index fda94edaa8..d08ee0e53c 100644 |--- a/base/base/find_symbols.h |+++ b/base/base/find_symbols.h -------------------------- Patching file base/base/find_symbols.h using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/base/iostream_debug_helpers.h b/base/base/iostream_debug_helpers.h |index db974c911d..0f07210f5c 100644 |--- a/base/base/iostream_debug_helpers.h |+++ b/base/base/iostream_debug_helpers.h -------------------------- Patching file base/base/iostream_debug_helpers.h using Plan A... Hunk #1 succeeded at 7. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/poco/Net/include/Poco/Net/HTTPSession.h b/base/poco/Net/include/Poco/Net/HTTPSession.h |index 934b34be5d..67afe9463a 100644 |--- a/base/poco/Net/include/Poco/Net/HTTPSession.h |+++ b/base/poco/Net/include/Poco/Net/HTTPSession.h -------------------------- Patching file base/poco/Net/include/Poco/Net/HTTPSession.h using Plan A... Hunk #1 succeeded at 19. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/azure/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp b/contrib/azure/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp |index 7bf338539c..e50c2b33a8 100644 |--- a/contrib/azure/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp |+++ b/contrib/azure/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp -------------------------- Patching file contrib/azure/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp using Plan A... Hunk #1 succeeded at 5. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/programs/copier/ShardPartition.h b/programs/copier/ShardPartition.h |index 2457213733..13bf58d49d 100644 |--- a/programs/copier/ShardPartition.h |+++ b/programs/copier/ShardPartition.h -------------------------- Patching file programs/copier/ShardPartition.h using Plan A... Hunk #1 succeeded at 4. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/programs/copier/ShardPartitionPiece.h b/programs/copier/ShardPartitionPiece.h |index 453364c0fc..9cf92c2ec3 100644 |--- a/programs/copier/ShardPartitionPiece.h |+++ b/programs/copier/ShardPartitionPiece.h -------------------------- Patching file programs/copier/ShardPartitionPiece.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Access/AccessBackup.h b/src/Access/AccessBackup.h |index 99f22b6c6a..559668f88a 100644 |--- a/src/Access/AccessBackup.h |+++ b/src/Access/AccessBackup.h -------------------------- Patching file src/Access/AccessBackup.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Access/DiskAccessStorage.h b/src/Access/DiskAccessStorage.h |index 5d94008b34..711370abef 100644 |--- a/src/Access/DiskAccessStorage.h |+++ b/src/Access/DiskAccessStorage.h -------------------------- Patching file src/Access/DiskAccessStorage.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Access/SettingsConstraints.cpp b/src/Access/SettingsConstraints.cpp |index 74c6bbe035..6b4f169356 100644 |--- a/src/Access/SettingsConstraints.cpp |+++ b/src/Access/SettingsConstraints.cpp -------------------------- Patching file src/Access/SettingsConstraints.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/BackupFileInfo.h b/src/Backups/BackupFileInfo.h |index 63da6f2342..40e8964d1b 100644 |--- a/src/Backups/BackupFileInfo.h |+++ b/src/Backups/BackupFileInfo.h -------------------------- Patching file src/Backups/BackupFileInfo.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/BackupIO.h b/src/Backups/BackupIO.h |index e4a82a604e..f5174ec462 100644 |--- a/src/Backups/BackupIO.h |+++ b/src/Backups/BackupIO.h -------------------------- Patching file src/Backups/BackupIO.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/BackupStatus.h b/src/Backups/BackupStatus.h |index 0afe6efe89..6575fc10e6 100644 |--- a/src/Backups/BackupStatus.h |+++ b/src/Backups/BackupStatus.h -------------------------- Patching file src/Backups/BackupStatus.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h |index ab4359ec25..a5443c0265 100644 |--- a/src/Backups/BackupsWorker.h |+++ b/src/Backups/BackupsWorker.h -------------------------- Patching file src/Backups/BackupsWorker.h using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/IBackupCoordination.h b/src/Backups/IBackupCoordination.h |index 75d9202374..79cc592426 100644 |--- a/src/Backups/IBackupCoordination.h |+++ b/src/Backups/IBackupCoordination.h -------------------------- Patching file src/Backups/IBackupCoordination.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/IRestoreCoordination.h b/src/Backups/IRestoreCoordination.h |index 2f9e8d171f..b36f89f29e 100644 |--- a/src/Backups/IRestoreCoordination.h |+++ b/src/Backups/IRestoreCoordination.h -------------------------- Patching file src/Backups/IRestoreCoordination.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Backups/RestoreCoordinationLocal.h b/src/Backups/RestoreCoordinationLocal.h |index e27f0d1ef8..4cbe144030 100644 |--- a/src/Backups/RestoreCoordinationLocal.h |+++ b/src/Backups/RestoreCoordinationLocal.h -------------------------- Patching file src/Backups/RestoreCoordinationLocal.h using Plan A... Hunk #1 succeeded at 4. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/AsyncLoader.h b/src/Common/AsyncLoader.h |index 77905319f0..789ce453e8 100644 |--- a/src/Common/AsyncLoader.h |+++ b/src/Common/AsyncLoader.h -------------------------- Patching file src/Common/AsyncLoader.h using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/CaresPTRResolver.cpp b/src/Common/CaresPTRResolver.cpp |index bf61e94074..4c4a451f61 100644 |--- a/src/Common/CaresPTRResolver.cpp |+++ b/src/Common/CaresPTRResolver.cpp -------------------------- Patching file src/Common/CaresPTRResolver.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/ConcurrencyControl.h b/src/Common/ConcurrencyControl.h |index ba87e3b3a0..b32f66e1da 100644 |--- a/src/Common/ConcurrencyControl.h |+++ b/src/Common/ConcurrencyControl.h -------------------------- Patching file src/Common/ConcurrencyControl.h using Plan A... Hunk #1 succeeded at 5. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/FileChecker.h b/src/Common/FileChecker.h |index bb0383e4b5..708ebcce13 100644 |--- a/src/Common/FileChecker.h |+++ b/src/Common/FileChecker.h -------------------------- Patching file src/Common/FileChecker.h using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/ProxyConfigurationResolverProvider.h b/src/Common/ProxyConfigurationResolverProvider.h |index f8c0552bd8..0fe47675b0 100644 |--- a/src/Common/ProxyConfigurationResolverProvider.h |+++ b/src/Common/ProxyConfigurationResolverProvider.h -------------------------- Patching file src/Common/ProxyConfigurationResolverProvider.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/ProxyListConfigurationResolver.h b/src/Common/ProxyListConfigurationResolver.h |index 95b84adfef..0e5323031a 100644 |--- a/src/Common/ProxyListConfigurationResolver.h |+++ b/src/Common/ProxyListConfigurationResolver.h -------------------------- Patching file src/Common/ProxyListConfigurationResolver.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/RemoteHostFilter.h b/src/Common/RemoteHostFilter.h |index 2b91306f40..2c4ebccbc0 100644 |--- a/src/Common/RemoteHostFilter.h |+++ b/src/Common/RemoteHostFilter.h -------------------------- Patching file src/Common/RemoteHostFilter.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h |index c4703a6999..071adf6c68 100644 |--- a/src/Common/ThreadProfileEvents.h |+++ b/src/Common/ThreadProfileEvents.h -------------------------- Patching file src/Common/ThreadProfileEvents.h using Plan A... Hunk #1 succeeded at 7. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h |index 1126cc189b..77cfd72849 100644 |--- a/src/Common/ZooKeeper/ZooKeeper.h |+++ b/src/Common/ZooKeeper/ZooKeeper.h -------------------------- Patching file src/Common/ZooKeeper/ZooKeeper.h using Plan A... Hunk #1 succeeded at 19. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Coordination/RaftServerConfig.h b/src/Coordination/RaftServerConfig.h |index 451d61a436..a248106e78 100644 |--- a/src/Coordination/RaftServerConfig.h |+++ b/src/Coordination/RaftServerConfig.h -------------------------- Patching file src/Coordination/RaftServerConfig.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Core/MySQL/MySQLCharset.h b/src/Core/MySQL/MySQLCharset.h |index 4371a2853e..fa53ad2819 100644 |--- a/src/Core/MySQL/MySQLCharset.h |+++ b/src/Core/MySQL/MySQLCharset.h -------------------------- Patching file src/Core/MySQL/MySQLCharset.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Disks/DiskType.cpp b/src/Disks/DiskType.cpp |index aa18cc6e0c..200708ae8b 100644 |--- a/src/Disks/DiskType.cpp |+++ b/src/Disks/DiskType.cpp -------------------------- Patching file src/Disks/DiskType.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Disks/IO/getThreadPoolReader.h b/src/Disks/IO/getThreadPoolReader.h |index 243e0e5478..e4f1abc363 100644 |--- a/src/Disks/IO/getThreadPoolReader.h |+++ b/src/Disks/IO/getThreadPoolReader.h -------------------------- Patching file src/Disks/IO/getThreadPoolReader.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp |index bbcdd40d85..1f9822c806 100644 |--- a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp |+++ b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp -------------------------- Patching file src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp using Plan A... Hunk #1 succeeded at 17. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp |index 7c1b15753d..0c0967e272 100644 |--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp |+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp -------------------------- Patching file src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Formats/BSONTypes.h b/src/Formats/BSONTypes.h |index 14a3e9decc..7009bdbed8 100644 |--- a/src/Formats/BSONTypes.h |+++ b/src/Formats/BSONTypes.h -------------------------- Patching file src/Formats/BSONTypes.h using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h |index 0c673f12cc..b3f792cb4e 100644 |--- a/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h |+++ b/src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h -------------------------- Patching file src/Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/IO/HTTPHeaderEntries.h b/src/IO/HTTPHeaderEntries.h |index 5862f1ead1..4a801fe9f6 100644 |--- a/src/IO/HTTPHeaderEntries.h |+++ b/src/IO/HTTPHeaderEntries.h -------------------------- Patching file src/IO/HTTPHeaderEntries.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/IO/ISchedulerNode.h b/src/IO/ISchedulerNode.h |index e3cf55431a..264b3c7ecd 100644 |--- a/src/IO/ISchedulerNode.h |+++ b/src/IO/ISchedulerNode.h -------------------------- Patching file src/IO/ISchedulerNode.h using Plan A... Hunk #1 succeeded at 14. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h |index b9a146e533..c0635903d0 100644 |--- a/src/Interpreters/InterpreterInsertQuery.h |+++ b/src/Interpreters/InterpreterInsertQuery.h -------------------------- Patching file src/Interpreters/InterpreterInsertQuery.h using Plan A... Hunk #1 succeeded at 5. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Loggers/OwnSplitChannel.h b/src/Loggers/OwnSplitChannel.h |index a6ee8af5b1..409776bc2a 100644 |--- a/src/Loggers/OwnSplitChannel.h |+++ b/src/Loggers/OwnSplitChannel.h -------------------------- Patching file src/Loggers/OwnSplitChannel.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Server/waitServersToFinish.h b/src/Server/waitServersToFinish.h |index b6daa02596..9e791eb860 100644 |--- a/src/Server/waitServersToFinish.h |+++ b/src/Server/waitServersToFinish.h -------------------------- Patching file src/Server/waitServersToFinish.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/MergeTree/IPartMetadataManager.h b/src/Storages/MergeTree/IPartMetadataManager.h |index d9e97d9151..5eda3ca216 100644 |--- a/src/Storages/MergeTree/IPartMetadataManager.h |+++ b/src/Storages/MergeTree/IPartMetadataManager.h -------------------------- Patching file src/Storages/MergeTree/IPartMetadataManager.h using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/NATS/NATSConnection.cpp b/src/Storages/NATS/NATSConnection.cpp |index 70b3599aa0..7418897440 100644 |--- a/src/Storages/NATS/NATSConnection.cpp |+++ b/src/Storages/NATS/NATSConnection.cpp -------------------------- Patching file src/Storages/NATS/NATSConnection.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/NATS/NATSHandler.cpp b/src/Storages/NATS/NATSHandler.cpp |index 7006e5633a..6f1cb720d2 100644 |--- a/src/Storages/NATS/NATSHandler.cpp |+++ b/src/Storages/NATS/NATSHandler.cpp -------------------------- Patching file src/Storages/NATS/NATSHandler.cpp using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/NATS/NATSHandler.h b/src/Storages/NATS/NATSHandler.h |index e3894c888a..8e08c900ed 100644 |--- a/src/Storages/NATS/NATSHandler.h |+++ b/src/Storages/NATS/NATSHandler.h -------------------------- Patching file src/Storages/NATS/NATSHandler.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/StorageLogSettings.h b/src/Storages/StorageLogSettings.h |index fa8bb28236..5293969b01 100644 |--- a/src/Storages/StorageLogSettings.h |+++ b/src/Storages/StorageLogSettings.h -------------------------- Patching file src/Storages/StorageLogSettings.h using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0011-Enable-SSE2-divide-implementation-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From b08418d5406972eb81088dfdb8438f15a465e520 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:44 +0000 |Subject: [PATCH 11/61] Enable SSE2 divide implementation on illumos | |--- | src/Functions/divide/CMakeLists.txt | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/src/Functions/divide/CMakeLists.txt b/src/Functions/divide/CMakeLists.txt |index 03c2faaf3c..bec9d3c66c 100644 |--- a/src/Functions/divide/CMakeLists.txt |+++ b/src/Functions/divide/CMakeLists.txt -------------------------- Patching file src/Functions/divide/CMakeLists.txt using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0012-Cast-arguments-to-FP-functions.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From a0979d26c3e26846495fc3a2056ea6b509fb5b46 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:51 +0000 |Subject: [PATCH 12/61] Cast arguments to FP functions | |--- | src/AggregateFunctions/QuantileExact.h | 12 ++++++------ | src/Functions/PerformanceAdaptors.h | 2 +- | src/Storages/MergeTree/SimpleMergeSelector.cpp | 4 ++-- | 3 files changed, 9 insertions(+), 9 deletions(-) | |diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h |index a92d1979ba..32d6fb3b6d 100644 |--- a/src/AggregateFunctions/QuantileExact.h |+++ b/src/AggregateFunctions/QuantileExact.h -------------------------- Patching file src/AggregateFunctions/QuantileExact.h using Plan A... Hunk #1 succeeded at 276. Hunk #2 succeeded at 312. Hunk #3 succeeded at 356. Hunk #4 succeeded at 384. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h |index ef2c788bf4..d1f2bd1388 100644 |--- a/src/Functions/PerformanceAdaptors.h |+++ b/src/Functions/PerformanceAdaptors.h -------------------------- Patching file src/Functions/PerformanceAdaptors.h using Plan A... Hunk #1 succeeded at 99. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/MergeTree/SimpleMergeSelector.cpp b/src/Storages/MergeTree/SimpleMergeSelector.cpp |index 7e7539f71d..2a9f1b9bdd 100644 |--- a/src/Storages/MergeTree/SimpleMergeSelector.cpp |+++ b/src/Storages/MergeTree/SimpleMergeSelector.cpp -------------------------- Patching file src/Storages/MergeTree/SimpleMergeSelector.cpp using Plan A... Hunk #1 succeeded at 210. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0013-IBridge-Don-t-set-max-RSS-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 60a689a1d0704323cd7c593ca457ffcdabd46acd Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:22:06 +0000 |Subject: [PATCH 13/61] IBridge: Don't set max RSS on illumos | |--- | src/Bridge/IBridge.cpp | 2 ++ | 1 file changed, 2 insertions(+) | |diff --git a/src/Bridge/IBridge.cpp b/src/Bridge/IBridge.cpp |index dd3c25e583..a663e1571c 100644 |--- a/src/Bridge/IBridge.cpp |+++ b/src/Bridge/IBridge.cpp -------------------------- Patching file src/Bridge/IBridge.cpp using Plan A... Hunk #1 succeeded at 167. Hunk #2 succeeded at 192. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0014-More-granular-configuration-of-TCP-keepalives.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From f5fa1b3c85ed4f834fa473d5d9324ac659f4bb95 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:18 +0000 |Subject: [PATCH 14/61] More granular configuration of TCP keepalives | |--- | src/Client/Connection.cpp | 34 ++++++++++++++++++++++++++++------ | 1 file changed, 28 insertions(+), 6 deletions(-) | |diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp |index d1b3388b2f..216f04bc28 100644 |--- a/src/Client/Connection.cpp |+++ b/src/Client/Connection.cpp -------------------------- Patching file src/Client/Connection.cpp using Plan A... Hunk #1 succeeded at 171. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0015-QueryProfiler-Only-enable-if-OS-supports-it.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 1763e04196e2615fdc274748a5b3e4bcfbe295ff Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:22:29 +0000 |Subject: [PATCH 15/61] QueryProfiler: Only enable if OS supports it | |--- | src/Common/QueryProfiler.cpp | 6 +++++- | 1 file changed, 5 insertions(+), 1 deletion(-) | |diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp |index dc9f361051..b95e6dad54 100644 |--- a/src/Common/QueryProfiler.cpp |+++ b/src/Common/QueryProfiler.cpp -------------------------- Patching file src/Common/QueryProfiler.cpp using Plan A... Hunk #1 succeeded at 98. Hunk #2 succeeded at 135. Hunk #3 succeeded at 218. Hunk #4 succeeded at 247. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0016-illumos-support-for-pollPid.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 53bbb150e618551996264b30872586ec102f668e Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 12:39:46 +0000 |Subject: [PATCH 16/61] illumos support for pollPid | |--- | src/Common/waitForPid.cpp | 22 ++++++++++++++++++++++ | 1 file changed, 22 insertions(+) | |diff --git a/src/Common/waitForPid.cpp b/src/Common/waitForPid.cpp |index 0ec1081135..539ec7a819 100644 |--- a/src/Common/waitForPid.cpp |+++ b/src/Common/waitForPid.cpp -------------------------- Patching file src/Common/waitForPid.cpp using Plan A... Hunk #1 succeeded at 153. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0017-Use-statvfs-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 3443a21d76e694bc19860138f9162dcaab2f0e36 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 12:49:22 +0000 |Subject: [PATCH 17/61] Use statvfs on illumos | |--- | utils/self-extracting-executable/decompressor.cpp | 13 +++++++++++++ | 1 file changed, 13 insertions(+) | |diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp |index 91f4bea5a5..27f4729779 100644 |--- a/utils/self-extracting-executable/decompressor.cpp |+++ b/utils/self-extracting-executable/decompressor.cpp -------------------------- Patching file utils/self-extracting-executable/decompressor.cpp using Plan A... Hunk #1 succeeded at 2. Hunk #2 succeeded at 212. Hunk #3 succeeded at 230. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0018-Do-not-try-to-increase-the-thread-limit-via-proc.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From c0eb3ea1f0a3c11fc8ce6e1c1b235b8d46f4a69c Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:12 +0000 |Subject: [PATCH 18/61] Do not try to increase the thread limit via /proc | |--- | programs/server/Server.cpp | 2 ++ | 1 file changed, 2 insertions(+) | |diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp |index 6f94e483e2..457cfb9e0a 100644 |--- a/programs/server/Server.cpp |+++ b/programs/server/Server.cpp -------------------------- Patching file programs/server/Server.cpp using Plan A... Hunk #1 succeeded at 938. Hunk #2 succeeded at 970. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0020-Use-libunwind-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From ad78db352cdb8bf60b88324d1528573992d8a36e Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:21 +0000 |Subject: [PATCH 20/61] Use libunwind on illumos | |--- | CMakeLists.txt | 4 +++- | contrib/libunwind-cmake/CMakeLists.txt | 6 +++++- | contrib/libunwind/src/AddressSpace.hpp | 4 ++++ | contrib/libunwind/src/UnwindRegistersRestore.S | 4 ---- | contrib/libunwind/src/UnwindRegistersSave.S | 4 ---- | contrib/libunwind/src/libunwind.cpp | 2 -- | src/CMakeLists.txt | 2 ++ | 7 files changed, 14 insertions(+), 12 deletions(-) | |diff --git a/CMakeLists.txt b/CMakeLists.txt |index eb99926dbc..33e4b308c4 100644 |--- a/CMakeLists.txt |+++ b/CMakeLists.txt -------------------------- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 260. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libunwind-cmake/CMakeLists.txt b/contrib/libunwind-cmake/CMakeLists.txt |index 733f99d07f..fd8b02efc3 100644 |--- a/contrib/libunwind-cmake/CMakeLists.txt |+++ b/contrib/libunwind-cmake/CMakeLists.txt -------------------------- Patching file contrib/libunwind-cmake/CMakeLists.txt using Plan A... Hunk #1 succeeded at 42. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libunwind/src/AddressSpace.hpp b/contrib/libunwind/src/AddressSpace.hpp |index b538ef7645..8d10e1b3e3 100644 |--- a/contrib/libunwind/src/AddressSpace.hpp |+++ b/contrib/libunwind/src/AddressSpace.hpp -------------------------- Patching file contrib/libunwind/src/AddressSpace.hpp using Plan A... Hunk #1 succeeded at 426. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libunwind/src/UnwindRegistersRestore.S b/contrib/libunwind/src/UnwindRegistersRestore.S |index eeb6453496..1b689a7ba2 100644 |--- a/contrib/libunwind/src/UnwindRegistersRestore.S |+++ b/contrib/libunwind/src/UnwindRegistersRestore.S -------------------------- Patching file contrib/libunwind/src/UnwindRegistersRestore.S using Plan A... Hunk #1 succeeded at 14. Hunk #2 succeeded at 1289. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libunwind/src/UnwindRegistersSave.S b/contrib/libunwind/src/UnwindRegistersSave.S |index f57dd637dd..85a7e7b157 100644 |--- a/contrib/libunwind/src/UnwindRegistersSave.S |+++ b/contrib/libunwind/src/UnwindRegistersSave.S -------------------------- Patching file contrib/libunwind/src/UnwindRegistersSave.S using Plan A... Hunk #1 succeeded at 14. Hunk #2 succeeded at 1224. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libunwind/src/libunwind.cpp b/contrib/libunwind/src/libunwind.cpp |index ca7d9a01e6..9a21a5b951 100644 |--- a/contrib/libunwind/src/libunwind.cpp |+++ b/contrib/libunwind/src/libunwind.cpp -------------------------- Patching file contrib/libunwind/src/libunwind.cpp using Plan A... Hunk #1 succeeded at 26. Hunk #2 succeeded at 335. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |index 81c7423447..ed33ea3800 100644 |--- a/src/CMakeLists.txt |+++ b/src/CMakeLists.txt -------------------------- Patching file src/CMakeLists.txt using Plan A... Hunk #1 succeeded at 267. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0021-Enable-memory-stats-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 5b736a9892e590afd865791da1a58999e6254b13 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:24 +0000 |Subject: [PATCH 21/61] Enable memory stats on illumos | |--- | src/Common/AsynchronousMetrics.cpp | 8 +++-- | src/Common/AsynchronousMetrics.h | 2 +- | src/Common/MemoryStatisticsOS.cpp | 51 +++++++++++++++++++++++++++++- | src/Common/MemoryStatisticsOS.h | 5 ++- | 4 files changed, 60 insertions(+), 6 deletions(-) | |diff --git a/src/Common/AsynchronousMetrics.cpp b/src/Common/AsynchronousMetrics.cpp |index 36c87010fa..f162796a7f 100644 |--- a/src/Common/AsynchronousMetrics.cpp |+++ b/src/Common/AsynchronousMetrics.cpp -------------------------- Patching file src/Common/AsynchronousMetrics.cpp using Plan A... Hunk #1 succeeded at 566. Hunk #2 succeeded at 596. Hunk #3 succeeded at 606. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/AsynchronousMetrics.h b/src/Common/AsynchronousMetrics.h |index e3b5142553..e46b7f227d 100644 |--- a/src/Common/AsynchronousMetrics.h |+++ b/src/Common/AsynchronousMetrics.h -------------------------- Patching file src/Common/AsynchronousMetrics.h using Plan A... Hunk #1 succeeded at 95. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/MemoryStatisticsOS.cpp b/src/Common/MemoryStatisticsOS.cpp |index f2d2ab5fea..c3c041322c 100644 |--- a/src/Common/MemoryStatisticsOS.cpp |+++ b/src/Common/MemoryStatisticsOS.cpp -------------------------- Patching file src/Common/MemoryStatisticsOS.cpp using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 19. Hunk #3 succeeded at 161. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Common/MemoryStatisticsOS.h b/src/Common/MemoryStatisticsOS.h |index 8eb6c871a9..ffd1e4a9aa 100644 |--- a/src/Common/MemoryStatisticsOS.h |+++ b/src/Common/MemoryStatisticsOS.h -------------------------- Patching file src/Common/MemoryStatisticsOS.h using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 47. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0022-Disable-skim-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From d00bb6ce7d1bff70d8785cd455230843c95acb93 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:51 +0000 |Subject: [PATCH 22/61] Disable 'skim' on illumos | |--- | rust/skim/CMakeLists.txt | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/rust/skim/CMakeLists.txt b/rust/skim/CMakeLists.txt |index 1e7a43aba7..f23677b65f 100644 |--- a/rust/skim/CMakeLists.txt |+++ b/rust/skim/CMakeLists.txt -------------------------- Patching file rust/skim/CMakeLists.txt using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0023-wide_integer-invalid-conversion.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From da244d21d224f6d89f7d095a32ead0f98f816cd7 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:54 +0000 |Subject: [PATCH 23/61] wide_integer invalid conversion | |--- | base/base/wide_integer_impl.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/base/base/wide_integer_impl.h b/base/base/wide_integer_impl.h |index fc4e9e551c..e3fcd0b9be 100644 |--- a/base/base/wide_integer_impl.h |+++ b/base/base/wide_integer_impl.h -------------------------- Patching file base/base/wide_integer_impl.h using Plan A... Hunk #1 succeeded at 575. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0024-Fix-compilation-of-headers-under-C-23.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 3750f16d1ad81221fd621c25e917b178a36caf27 Mon Sep 17 00:00:00 2001 |From: Adrian Vogelsgesang |Date: Thu, 4 May 2023 12:20:29 +0000 |Subject: [PATCH 24/61] Fix compilation of headers under C++23 | |`DoubleAPFloat` has a `unique_ptr` member. In |`DoubleAPFloat::operator=` and `DoubleAPFloat::get{First,Second}`, |the methods of this unique_ptr are getting instantiated. At that |point `APFloat` is still only a forward declaration. | |This triggers undefined behavior. So far, we were probaly just |lucky and the code compiled fine. However, with C++23 |`std::unique_ptr` became constexpr, and clang (and other compilers) are |now diagnosing this latent bug as an error. | |This commit fixes the issue by moving the function definitions |out of the class definition of `DoubleAPFloat`, after the declaration |of `APFloat`. | |A similar issue exists in `ModuleSummaryIndex.h`, the fix is pretty |much identical. | |Fixes #59784 | |Differential Revision: https://reviews.llvm.org/D149854 |--- | .../llvm/include/llvm/ADT/APFloat.h | 38 +++++++++++++------ | .../llvm/include/llvm/IR/ModuleSummaryIndex.h | 4 +- | 2 files changed, 29 insertions(+), 13 deletions(-) | |diff --git a/contrib/llvm-project/llvm/include/llvm/ADT/APFloat.h b/contrib/llvm-project/llvm/include/llvm/ADT/APFloat.h |index cdedb6ece9..ab1bab2cdc 100644 |--- a/contrib/llvm-project/llvm/include/llvm/ADT/APFloat.h |+++ b/contrib/llvm-project/llvm/include/llvm/ADT/APFloat.h -------------------------- Patching file contrib/llvm-project/llvm/include/llvm/ADT/APFloat.h using Plan A... Hunk #1 succeeded at 620. Hunk #2 succeeded at 1331. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/llvm-project/llvm/include/llvm/IR/ModuleSummaryIndex.h b/contrib/llvm-project/llvm/include/llvm/IR/ModuleSummaryIndex.h |index 468773ac59..d81fbd2a86 100644 |--- a/contrib/llvm-project/llvm/include/llvm/IR/ModuleSummaryIndex.h |+++ b/contrib/llvm-project/llvm/include/llvm/IR/ModuleSummaryIndex.h -------------------------- Patching file contrib/llvm-project/llvm/include/llvm/IR/ModuleSummaryIndex.h using Plan A... Hunk #1 succeeded at 145. Hunk #2 succeeded at 444. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0025-DependencyGraph-missing-overloads.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 8fac92173e01b36d3aeea2b4862616dca3af2ab4 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:48:13 +0000 |Subject: [PATCH 25/61] DependencyGraph: missing overloads | |--- | src/Databases/TablesDependencyGraph.h | 2 ++ | 1 file changed, 2 insertions(+) | |diff --git a/src/Databases/TablesDependencyGraph.h b/src/Databases/TablesDependencyGraph.h |index e5be59d1ee..83f6228b77 100644 |--- a/src/Databases/TablesDependencyGraph.h |+++ b/src/Databases/TablesDependencyGraph.h -------------------------- Patching file src/Databases/TablesDependencyGraph.h using Plan A... Hunk #1 succeeded at 151. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0026-parseLDAPServer-std-optional-emplace-failure.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 54d05eeedc3bae27255d1ee8ee851e64a2ea5158 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:48:06 +0000 |Subject: [PATCH 26/61] parseLDAPServer: std::optional emplace() failure | |See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 |--- | src/Access/ExternalAuthenticators.cpp | 11 +++++------ | 1 file changed, 5 insertions(+), 6 deletions(-) | |diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp |index e4d4d2acd0..f0c893cbcd 100644 |--- a/src/Access/ExternalAuthenticators.cpp |+++ b/src/Access/ExternalAuthenticators.cpp -------------------------- Patching file src/Access/ExternalAuthenticators.cpp using Plan A... Hunk #1 succeeded at 99. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0027-KeeperStateMachine-std-optional-emplace-failure.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 5a9569b2e2e3745679f074883a49ea53f875576c Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 16:18:16 +0000 |Subject: [PATCH 27/61] KeeperStateMachine: std::optional emplace() failure | |See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 |--- | src/Coordination/KeeperStateMachine.cpp | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp |index 8f2e3c3ac0..224a910315 100644 |--- a/src/Coordination/KeeperStateMachine.cpp |+++ b/src/Coordination/KeeperStateMachine.cpp -------------------------- Patching file src/Coordination/KeeperStateMachine.cpp using Plan A... Hunk #1 succeeded at 244. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0028-KeeperStorage-need-to-explicitly-specify-operator-re.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 558d177364000986f83132bd5746072abb6aed84 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:48:19 +0000 |Subject: [PATCH 28/61] KeeperStorage: need to explicitly specify operator | return type | |--- | src/Coordination/KeeperStorage.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h |index 844cbf85c1..6ac389e5f9 100644 |--- a/src/Coordination/KeeperStorage.h |+++ b/src/Coordination/KeeperStorage.h -------------------------- Patching file src/Coordination/KeeperStorage.h using Plan A... Hunk #1 succeeded at 281. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0029-IPAddressDictionary-use-boost-variant2.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From b19afd02b0519543c0148d8eabe538bf7d133665 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:48:22 +0000 |Subject: [PATCH 29/61] IPAddressDictionary: use boost::variant2 | |For unknown reasons, using std::variant here fails during compilation. |Attempting to store a std::string in the variant results in |the compiler resolving the best variant option as wide::integer |(which is obviously wrong) and attempting to cast a std::string into a |wide::integer triggers an assertion. | |Using boost's variant2 works. |--- | src/Dictionaries/IPAddressDictionary.cpp | 32 +++++++++++++----------- | src/Dictionaries/IPAddressDictionary.h | 9 ++++--- | 2 files changed, 22 insertions(+), 19 deletions(-) | |diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp |index 6bb06de750..1b05f8768c 100644 |--- a/src/Dictionaries/IPAddressDictionary.cpp |+++ b/src/Dictionaries/IPAddressDictionary.cpp -------------------------- Patching file src/Dictionaries/IPAddressDictionary.cpp using Plan A... Hunk #1 succeeded at 23. Hunk #2 succeeded at 242. Hunk #3 succeeded at 534. Hunk #4 succeeded at 548. Hunk #5 succeeded at 621. Hunk #6 succeeded at 665. Hunk #7 succeeded at 711. Hunk #8 succeeded at 761. Hunk #9 succeeded at 798. Hunk #10 succeeded at 811. Hunk #11 succeeded at 852. Hunk #12 succeeded at 894. Hunk #13 succeeded at 904. Hunk #14 succeeded at 921. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h |index 40dc5dd678..b8b16e969e 100644 |--- a/src/Dictionaries/IPAddressDictionary.h |+++ b/src/Dictionaries/IPAddressDictionary.h -------------------------- Patching file src/Dictionaries/IPAddressDictionary.h using Plan A... Hunk #1 succeeded at 2. Hunk #2 succeeded at 17. Hunk #3 succeeded at 98. Hunk #4 succeeded at 124. Hunk #5 succeeded at 206. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0030-StorageURL-Trying-to-return-std-tuple-from-function-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From f34786dd31ea938be299a05025c2d756c9060882 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 17:12:22 +0000 |Subject: [PATCH 30/61] StorageURL: Trying to return std::tuple from function | declared as std::pair | |Without this change, the compiler is unable to find a way to convert |the constructed std::tuple to a std::pair as required by the |function signature. |--- | src/Storages/StorageURL.cpp | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp |index 0764c4e086..a60b21ad2b 100644 |--- a/src/Storages/StorageURL.cpp |+++ b/src/Storages/StorageURL.cpp -------------------------- Patching file src/Storages/StorageURL.cpp using Plan A... Hunk #1 succeeded at 479. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0031-MergeTree-Use-logf.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7f783c9e67ea5e85e234db9f9fe27125dc7739f3 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 17:13:01 +0000 |Subject: [PATCH 31/61] MergeTree: Use logf | |--- | src/Storages/MergeTree/MergeFromLogEntryTask.cpp | 2 +- | src/Storages/MergeTree/MutateFromLogEntryTask.cpp | 2 +- | 2 files changed, 2 insertions(+), 2 deletions(-) | |diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp |index 883cfee89c..75a3829497 100644 |--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp |+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp -------------------------- Patching file src/Storages/MergeTree/MergeFromLogEntryTask.cpp using Plan A... Hunk #1 succeeded at 231. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp |index 164b541d2b..35483839ec 100644 |--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp |+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp -------------------------- Patching file src/Storages/MergeTree/MutateFromLogEntryTask.cpp using Plan A... Hunk #1 succeeded at 140. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0032-Loggers-unresolved-std-time_put.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From ef9bfbee646109e7d86adc0b69f5fc4ff4166d62 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Sun, 26 Nov 2023 10:57:56 +0000 |Subject: [PATCH 32/61] Loggers: unresolved std::time_put | |For some reason, the std::put_time() here resolves to a variant of |std::time_put() that is not satisfied by the libstdc++ headers, and |results in a link error. | |Undefined first referenced | symbol in file |_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKSt2tmPKcSB_ |src/Loggers/libloggers.a(Loggers.cpp.o) |ld: fatal: symbol referencing errors. No output written to programs/clickhouse | |% demangle _ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKSt2tmPKcSB_ |std::time_put > ::put(std::ostreambuf_iterator >, std::ios_base&, char, std::tm const*, char const*, char const*) const |--- | src/Loggers/Loggers.cpp | 10 ++++++++++ | 1 file changed, 10 insertions(+) | |diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp |index 90b3457b7d..8ab0f0028a 100644 |--- a/src/Loggers/Loggers.cpp |+++ b/src/Loggers/Loggers.cpp -------------------------- Patching file src/Loggers/Loggers.cpp using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 49. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0033-config-processor-missing-files-in-link.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 410b339bb31f2d47f11dee7fc560b42c37954c4d Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Sun, 26 Nov 2023 11:16:39 +0000 |Subject: [PATCH 33/61] config-processor: missing files in link | |This needs more investigation. Without this patch, we see link errors |identical to those reported in | https://github.com/ClickHouse/ClickHouse/issues/53565 |The fix there was to use `lld` as the linker, but the underlying |cause was not determined in that issue. | |Undefined first referenced | symbol in file |DB::ICompressionCodec::compress(char const*, unsigned int, char*) const |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::ICompressionCodec::readDecompressedBlockSize(char const*) |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::toEncryptionMethod(std::__cxx11::basic_string, |std::allocator > const&) |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::CompressionCodecEncrypted::Configuration::load(Poco::Util::AbstractConfiguration |const&, std::__cxx11::basic_string, |std::allocator > const&) |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::ICompressionCodec::decompress(char const*, unsigned int, char*) const |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |vtable for DB::ICompressionCodec |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::CompressionCodecEncrypted::Configuration::instance() |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |DB::CompressionCodecEncrypted::CompressionCodecEncrypted(DB::EncryptionMethod) |src/Common/Config/libclickhouse_common_config.a(ConfigProcessor.cpp.o) |--- | utils/config-processor/CMakeLists.txt | 10 +++++++++- | 1 file changed, 9 insertions(+), 1 deletion(-) | |diff --git a/utils/config-processor/CMakeLists.txt b/utils/config-processor/CMakeLists.txt |index 80c3535ef4..37b73bf9af 100644 |--- a/utils/config-processor/CMakeLists.txt |+++ b/utils/config-processor/CMakeLists.txt -------------------------- Patching file utils/config-processor/CMakeLists.txt using Plan A... Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0034-library-bridge-missing-files-in-link.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From a066e2a3c7c9526c653ad33aaa92ca0c69ef7b22 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Sun, 26 Nov 2023 11:45:15 +0000 |Subject: [PATCH 34/61] library-bridge: missing files in link | |--- | programs/library-bridge/CMakeLists.txt | 6 ++++++ | 1 file changed, 6 insertions(+) | |diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt |index dd0bf67cb6..c516cd968e 100644 |--- a/programs/library-bridge/CMakeLists.txt |+++ b/programs/library-bridge/CMakeLists.txt -------------------------- Patching file programs/library-bridge/CMakeLists.txt using Plan A... Hunk #1 succeeded at 13. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0035-Ensure-that-libunwind-is-linked-in-the-final-objects.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 62f1418f484d083bcf10ff4110e8e7deec2280f3 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:48:25 +0000 |Subject: [PATCH 35/61] Ensure that libunwind is linked in the final objects | |--- | cmake/sunos/default_libs.cmake | 1 + | 1 file changed, 1 insertion(+) | |diff --git a/cmake/sunos/default_libs.cmake b/cmake/sunos/default_libs.cmake |index 82a6113b05..e3cbb4d027 100644 |--- a/cmake/sunos/default_libs.cmake |+++ b/cmake/sunos/default_libs.cmake -------------------------- Patching file cmake/sunos/default_libs.cmake using Plan A... Hunk #1 succeeded at 7. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0036-Restore-poco-SUN-files.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From ad66051f8669aabd72f4e45fe8939fd2cfe83bcd Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:30 +0000 |Subject: [PATCH 36/61] Restore poco SUN files | |These were accidentally deleted as unused in |https://github.com/ClickHouse/ClickHouse/commit/44afecf083b2cfa3d77d2e227f |--- | .../include/Poco/FPEnvironment_SUN.h | 75 ++++++++++ | .../poco/Foundation/src/FPEnvironment_SUN.cpp | 139 ++++++++++++++++++ | 2 files changed, 214 insertions(+) | create mode 100644 base/poco/Foundation/include/Poco/FPEnvironment_SUN.h | create mode 100644 base/poco/Foundation/src/FPEnvironment_SUN.cpp | |diff --git a/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h b/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h |new file mode 100644 |index 0000000000..7b31307e1c |--- /dev/null |+++ b/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h -------------------------- (Creating file base/poco/Foundation/include/Poco/FPEnvironment_SUN.h...) Patching file base/poco/Foundation/include/Poco/FPEnvironment_SUN.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/poco/Foundation/src/FPEnvironment_SUN.cpp b/base/poco/Foundation/src/FPEnvironment_SUN.cpp |new file mode 100644 |index 0000000000..36ee36431d |--- /dev/null |+++ b/base/poco/Foundation/src/FPEnvironment_SUN.cpp -------------------------- (Creating file base/poco/Foundation/src/FPEnvironment_SUN.cpp...) Patching file base/poco/Foundation/src/FPEnvironment_SUN.cpp using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0037-poco-foundation-add-illumos-support.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7e67ca854db0c24ff0666a666a57d4e09bbe13c3 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:36 +0000 |Subject: [PATCH 37/61] poco foundation: add illumos support | |--- | base/poco/Foundation/src/Environment_UNIX.cpp | 6 +++--- | base/poco/Foundation/src/NamedEvent_UNIX.cpp | 2 +- | base/poco/Foundation/src/NamedMutex_UNIX.cpp | 2 +- | 3 files changed, 5 insertions(+), 5 deletions(-) | |diff --git a/base/poco/Foundation/src/Environment_UNIX.cpp b/base/poco/Foundation/src/Environment_UNIX.cpp |index 202e5d88f8..faabb37477 100644 |--- a/base/poco/Foundation/src/Environment_UNIX.cpp |+++ b/base/poco/Foundation/src/Environment_UNIX.cpp -------------------------- Patching file base/poco/Foundation/src/Environment_UNIX.cpp using Plan A... Hunk #1 succeeded at 281. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/poco/Foundation/src/NamedEvent_UNIX.cpp b/base/poco/Foundation/src/NamedEvent_UNIX.cpp |index 978e6e0bc0..3cda4104c7 100644 |--- a/base/poco/Foundation/src/NamedEvent_UNIX.cpp |+++ b/base/poco/Foundation/src/NamedEvent_UNIX.cpp -------------------------- Patching file base/poco/Foundation/src/NamedEvent_UNIX.cpp using Plan A... Hunk #1 succeeded at 31. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/base/poco/Foundation/src/NamedMutex_UNIX.cpp b/base/poco/Foundation/src/NamedMutex_UNIX.cpp |index 6cfa1369c9..d53d54d7bb 100644 |--- a/base/poco/Foundation/src/NamedMutex_UNIX.cpp |+++ b/base/poco/Foundation/src/NamedMutex_UNIX.cpp -------------------------- Patching file base/poco/Foundation/src/NamedMutex_UNIX.cpp using Plan A... Hunk #1 succeeded at 31. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0038-contrib-abseil-cpp-Allow-i386-for-system-processor.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 5a2b7841a7ad581f93a403e659466b743894d859 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:27 +0000 |Subject: [PATCH 38/61] contrib/abseil-cpp: Allow "i386" for system processor | |--- | contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake b/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake |index 942ce90a4d..398413a8ee 100644 |--- a/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake |+++ b/contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake -------------------------- Patching file contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake using Plan A... Hunk #1 succeeded at 12. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0039-contrib-abseil-cpp-illumos-does-not-have-VDSO-suppor.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7557ef1fe956f80ccf09e489af4aab3cbf0113af Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:36 +0000 |Subject: [PATCH 39/61] contrib/abseil-cpp: illumos does not have VDSO support | |--- | contrib/abseil-cpp/absl/debugging/internal/vdso_support.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/contrib/abseil-cpp/absl/debugging/internal/vdso_support.h b/contrib/abseil-cpp/absl/debugging/internal/vdso_support.h |index 6562c6c235..bc0d7fddc6 100644 |--- a/contrib/abseil-cpp/absl/debugging/internal/vdso_support.h |+++ b/contrib/abseil-cpp/absl/debugging/internal/vdso_support.h -------------------------- Patching file contrib/abseil-cpp/absl/debugging/internal/vdso_support.h using Plan A... Hunk #1 succeeded at 48. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0040-contrib-azure-Use-arc4random-and-SIGPIPE-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From f9de67fc7f6d6201cb31d28e99299a37ab0343eb Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:42 +0000 |Subject: [PATCH 40/61] contrib/azure: Use arc4random and SIGPIPE on illumos | |--- | .../azure/sdk/core/azure-core/src/http/retry_policy.cpp | 8 +------- | .../sdk/core/azure-core/src/http/telemetry_policy.cpp | 2 +- | contrib/cassandra-cmake/CMakeLists.txt | 4 ++-- | 3 files changed, 4 insertions(+), 10 deletions(-) | |diff --git a/contrib/azure/sdk/core/azure-core/src/http/retry_policy.cpp b/contrib/azure/sdk/core/azure-core/src/http/retry_policy.cpp |index 044e0baf1d..1f9fea6a25 100644 |--- a/contrib/azure/sdk/core/azure-core/src/http/retry_policy.cpp |+++ b/contrib/azure/sdk/core/azure-core/src/http/retry_policy.cpp -------------------------- Patching file contrib/azure/sdk/core/azure-core/src/http/retry_policy.cpp using Plan A... Hunk #1 succeeded at 61. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/azure/sdk/core/azure-core/src/http/telemetry_policy.cpp b/contrib/azure/sdk/core/azure-core/src/http/telemetry_policy.cpp |index 0a012d5efd..143e9f570e 100644 |--- a/contrib/azure/sdk/core/azure-core/src/http/telemetry_policy.cpp |+++ b/contrib/azure/sdk/core/azure-core/src/http/telemetry_policy.cpp -------------------------- Patching file contrib/azure/sdk/core/azure-core/src/http/telemetry_policy.cpp using Plan A... Hunk #1 succeeded at 110. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/cassandra-cmake/CMakeLists.txt b/contrib/cassandra-cmake/CMakeLists.txt |index 32611e0e15..8ef4d22565 100644 |--- a/contrib/cassandra-cmake/CMakeLists.txt |+++ b/contrib/cassandra-cmake/CMakeLists.txt -------------------------- Patching file contrib/cassandra-cmake/CMakeLists.txt using Plan A... Hunk #1 succeeded at 90. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0041-contrib-azure-forward-declaration-before-unique_ptr.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 8bbe23e3ecdb61d488481bd38840ab828513affe Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 17:09:36 +0000 |Subject: [PATCH 41/61] contrib/azure: forward declaration before unique_ptr | |--- | .../azure-storage-common/src/xml_wrapper.cpp | 14 +++++++------- | 1 file changed, 7 insertions(+), 7 deletions(-) | |diff --git a/contrib/azure/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/contrib/azure/sdk/storage/azure-storage-common/src/xml_wrapper.cpp |index 49da184982..d9dae74a22 100644 |--- a/contrib/azure/sdk/storage/azure-storage-common/src/xml_wrapper.cpp |+++ b/contrib/azure/sdk/storage/azure-storage-common/src/xml_wrapper.cpp -------------------------- Patching file contrib/azure/sdk/storage/azure-storage-common/src/xml_wrapper.cpp using Plan A... Hunk #1 succeeded at 404. Hunk #2 succeeded at 415. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0042-contrib-boost-Rename-tokens-due-to-regset.h-pollutio.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 1ebd5e8e5500ecaf6a54c4fb122ab1f9dc57639e Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 12:43:38 +0000 |Subject: [PATCH 42/61] contrib/boost: Rename tokens due to regset.h pollution | |--- | .../geometry/strategies/line_interpolate/cartesian.hpp | 6 +++--- | .../geometry/strategies/line_interpolate/spherical.hpp | 8 ++++---- | 2 files changed, 7 insertions(+), 7 deletions(-) | |diff --git a/contrib/boost/boost/geometry/strategies/line_interpolate/cartesian.hpp b/contrib/boost/boost/geometry/strategies/line_interpolate/cartesian.hpp |index d00b473089..e1f52f797d 100644 |--- a/contrib/boost/boost/geometry/strategies/line_interpolate/cartesian.hpp |+++ b/contrib/boost/boost/geometry/strategies/line_interpolate/cartesian.hpp -------------------------- Patching file contrib/boost/boost/geometry/strategies/line_interpolate/cartesian.hpp using Plan A... Hunk #1 succeeded at 56. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/boost/boost/geometry/strategies/line_interpolate/spherical.hpp b/contrib/boost/boost/geometry/strategies/line_interpolate/spherical.hpp |index 6b083bb313..4ad668158e 100644 |--- a/contrib/boost/boost/geometry/strategies/line_interpolate/spherical.hpp |+++ b/contrib/boost/boost/geometry/strategies/line_interpolate/spherical.hpp -------------------------- Patching file contrib/boost/boost/geometry/strategies/line_interpolate/spherical.hpp using Plan A... Hunk #1 succeeded at 72. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0043-contrib-c-ares-add-illumos-as-a-platform.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From e55b78d32e1e5de8e1e9c18ce25aed30d5bf4239 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:33 +0000 |Subject: [PATCH 43/61] contrib/c-ares: add illumos as a platform | |--- | contrib/c-ares-cmake/CMakeLists.txt | 2 + | contrib/c-ares-cmake/solaris/ares_build.h | 104 +++++ | contrib/c-ares-cmake/solaris/ares_config.h | 503 +++++++++++++++++++++ | 3 files changed, 609 insertions(+) | create mode 100644 contrib/c-ares-cmake/solaris/ares_build.h | create mode 100644 contrib/c-ares-cmake/solaris/ares_config.h | |diff --git a/contrib/c-ares-cmake/CMakeLists.txt b/contrib/c-ares-cmake/CMakeLists.txt |index 86ab6f9026..daec96ff1b 100644 |--- a/contrib/c-ares-cmake/CMakeLists.txt |+++ b/contrib/c-ares-cmake/CMakeLists.txt -------------------------- Patching file contrib/c-ares-cmake/CMakeLists.txt using Plan A... Hunk #1 succeeded at 86. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/c-ares-cmake/solaris/ares_build.h b/contrib/c-ares-cmake/solaris/ares_build.h |new file mode 100644 |index 0000000000..f42b59d07b |--- /dev/null |+++ b/contrib/c-ares-cmake/solaris/ares_build.h -------------------------- (Creating file contrib/c-ares-cmake/solaris/ares_build.h...) Patching file contrib/c-ares-cmake/solaris/ares_build.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/c-ares-cmake/solaris/ares_config.h b/contrib/c-ares-cmake/solaris/ares_config.h |new file mode 100644 |index 0000000000..c4ac5e3896 |--- /dev/null |+++ b/contrib/c-ares-cmake/solaris/ares_config.h -------------------------- (Creating file contrib/c-ares-cmake/solaris/ares_config.h...) Patching file contrib/c-ares-cmake/solaris/ares_config.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0044-contrib-cctz-Fix-char-array-index-warning.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 966a88272cd71b83273fd5efab800093de3083c4 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 17:10:04 +0000 |Subject: [PATCH 44/61] contrib/cctz: Fix char array index warning | |--- | contrib/cctz/include/cctz/civil_time_detail.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/contrib/cctz/include/cctz/civil_time_detail.h b/contrib/cctz/include/cctz/civil_time_detail.h |index 2dab6640df..96f7e85afc 100644 |--- a/contrib/cctz/include/cctz/civil_time_detail.h |+++ b/contrib/cctz/include/cctz/civil_time_detail.h -------------------------- Patching file contrib/cctz/include/cctz/civil_time_detail.h using Plan A... Hunk #1 succeeded at 95. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0045-contrib-curl-Add-illumos-support.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 39151dc3aec237c4360eb4b5b757bafdba286bcd Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:31:06 +0000 |Subject: [PATCH 45/61] contrib/curl: Add illumos support | |--- | contrib/curl-cmake/curl_config.h | 6 ++++++ | 1 file changed, 6 insertions(+) | |diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h |index f56ba3eccd..1aaa0bc341 100644 |--- a/contrib/curl-cmake/curl_config.h |+++ b/contrib/curl-cmake/curl_config.h -------------------------- Patching file contrib/curl-cmake/curl_config.h using Plan A... Hunk #1 succeeded at 50. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0046-contrib-datasketches-Rename-tokens-due-to-regset.h-p.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 0719ee17150f7fcbe1e21c6c9a9314d453dd9804 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:41 +0000 |Subject: [PATCH 46/61] contrib/datasketches: Rename tokens due to regset.h | pollution | |--- | .../include/theta_intersection_base_impl.hpp | 28 ++++++++--------- | .../theta/include/theta_intersection_impl.hpp | 6 ++-- | .../theta_set_difference_base_impl.hpp | 12 ++++---- | .../theta/include/theta_union_base_impl.hpp | 30 +++++++++---------- | .../theta/include/theta_union_impl.hpp | 6 ++-- | 5 files changed, 41 insertions(+), 41 deletions(-) | |diff --git a/contrib/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp |index 49736dd2c0..c616e5f443 100644 |--- a/contrib/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp |+++ b/contrib/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp -------------------------- Patching file contrib/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp using Plan A... Hunk #1 succeeded at 26. Hunk #2 succeeded at 55. Hunk #3 succeeded at 69. Hunk #4 succeeded at 97. Hunk #5 succeeded at 106. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/datasketches-cpp/theta/include/theta_intersection_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_intersection_impl.hpp |index 5f0575f92c..bdb1bc3659 100644 |--- a/contrib/datasketches-cpp/theta/include/theta_intersection_impl.hpp |+++ b/contrib/datasketches-cpp/theta/include/theta_intersection_impl.hpp -------------------------- Patching file contrib/datasketches-cpp/theta/include/theta_intersection_impl.hpp using Plan A... Hunk #1 succeeded at 28. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp |index 61042436b6..a35f809c19 100644 |--- a/contrib/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp |+++ b/contrib/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp -------------------------- Patching file contrib/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp using Plan A... Hunk #1 succeeded at 28. Hunk #2 succeeded at 78. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp |index bc8f4902ce..c53aa7ac66 100644 |--- a/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp |+++ b/contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp -------------------------- Patching file contrib/datasketches-cpp/theta/include/theta_union_base_impl.hpp using Plan A... Hunk #1 succeeded at 27. Hunk #2 succeeded at 47. Hunk #3 succeeded at 58. Hunk #4 succeeded at 77. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp b/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp |index 8618618ade..588f26644d 100644 |--- a/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp |+++ b/contrib/datasketches-cpp/theta/include/theta_union_impl.hpp -------------------------- Patching file contrib/datasketches-cpp/theta/include/theta_union_impl.hpp using Plan A... Hunk #1 succeeded at 28. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0047-contrib-libarchive-Add-illumos-support.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 6115b52e35e3ca4b519cc7737d942ebd943aea12 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:31:22 +0000 |Subject: [PATCH 47/61] contrib/libarchive: Add illumos support | |--- | contrib/libarchive-cmake/CMakeLists.txt | 18 +- | contrib/libarchive-cmake/illumos/config.h | 1397 +++++++++++++++++++++ | 2 files changed, 1410 insertions(+), 5 deletions(-) | create mode 100644 contrib/libarchive-cmake/illumos/config.h | |diff --git a/contrib/libarchive-cmake/CMakeLists.txt b/contrib/libarchive-cmake/CMakeLists.txt |index cd5658b708..dd6056c11f 100644 |--- a/contrib/libarchive-cmake/CMakeLists.txt |+++ b/contrib/libarchive-cmake/CMakeLists.txt -------------------------- Patching file contrib/libarchive-cmake/CMakeLists.txt using Plan A... Hunk #1 succeeded at 135. Hunk #2 succeeded at 187. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libarchive-cmake/illumos/config.h b/contrib/libarchive-cmake/illumos/config.h |new file mode 100644 |index 0000000000..0f8af23eea |--- /dev/null |+++ b/contrib/libarchive-cmake/illumos/config.h -------------------------- (Creating file contrib/libarchive-cmake/illumos/config.h...) Patching file contrib/libarchive-cmake/illumos/config.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0048-contrib-libpq-Do-not-use-strerror_r-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 6a085dee5bba9441e87297a480813a3d73d5f493 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:06 +0000 |Subject: [PATCH 48/61] contrib/libpq: Do not use strerror_r on illumos | |The code expects GNU strerror_r() which is different to the illumos one. |strerror() is thread-safe so safe to use as a replacement, which is |what pg_strerror_r() does. |--- | contrib/libpq/fe-auth.c | 4 ++-- | contrib/libpq/fe-connect.c | 4 ++-- | contrib/libpq/fe-lobj.c | 10 +++++----- | contrib/libpq/fe-secure-openssl.c | 2 +- | contrib/libpq/include/port.h | 2 ++ | contrib/libpq/libpq-int.h | 2 +- | contrib/libpq/port/snprintf.c | 2 +- | 7 files changed, 14 insertions(+), 12 deletions(-) | |diff --git a/contrib/libpq/fe-auth.c b/contrib/libpq/fe-auth.c |index e8062647e6..f29b86f96c 100644 |--- a/contrib/libpq/fe-auth.c |+++ b/contrib/libpq/fe-auth.c -------------------------- Patching file contrib/libpq/fe-auth.c using Plan A... Hunk #1 succeeded at 732. Hunk #2 succeeded at 1116. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/fe-connect.c b/contrib/libpq/fe-connect.c |index fc65e490ef..a5807d8501 100644 |--- a/contrib/libpq/fe-connect.c |+++ b/contrib/libpq/fe-connect.c -------------------------- Patching file contrib/libpq/fe-connect.c using Plan A... Hunk #1 succeeded at 2838. Hunk #2 succeeded at 2850. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/fe-lobj.c b/contrib/libpq/fe-lobj.c |index ffd9926dc4..9c3a618a5f 100644 |--- a/contrib/libpq/fe-lobj.c |+++ b/contrib/libpq/fe-lobj.c -------------------------- Patching file contrib/libpq/fe-lobj.c using Plan A... Hunk #1 succeeded at 676. Hunk #2 succeeded at 733. Hunk #3 succeeded at 788. Hunk #4 succeeded at 809. Hunk #5 succeeded at 832. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/fe-secure-openssl.c b/contrib/libpq/fe-secure-openssl.c |index 497777bd4c..fbbb22a56a 100644 |--- a/contrib/libpq/fe-secure-openssl.c |+++ b/contrib/libpq/fe-secure-openssl.c -------------------------- Patching file contrib/libpq/fe-secure-openssl.c using Plan A... Hunk #1 succeeded at 1029. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/include/port.h b/contrib/libpq/include/port.h |index 82f63de325..2b27c650dc 100644 |--- a/contrib/libpq/include/port.h |+++ b/contrib/libpq/include/port.h -------------------------- Patching file contrib/libpq/include/port.h using Plan A... Hunk #1 succeeded at 230. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/libpq-int.h b/contrib/libpq/libpq-int.h |index 6b7fd2c267..aa848b5fa2 100644 |--- a/contrib/libpq/libpq-int.h |+++ b/contrib/libpq/libpq-int.h -------------------------- Patching file contrib/libpq/libpq-int.h using Plan A... Hunk #1 succeeded at 850. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/libpq/port/snprintf.c b/contrib/libpq/port/snprintf.c |index c0a452da0f..95eddd1a64 100644 |--- a/contrib/libpq/port/snprintf.c |+++ b/contrib/libpq/port/snprintf.c -------------------------- Patching file contrib/libpq/port/snprintf.c using Plan A... Hunk #1 succeeded at 707. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0049-contrib-libpq-ignore-pg_attribute_printf.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 57e6dcaa6b02b3e827eabc27e806eb696ebbd512 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:54 +0000 |Subject: [PATCH 49/61] contrib/libpq: ignore pg_attribute_printf | |--- | contrib/libpq/include/port.h | 3 +++ | 1 file changed, 3 insertions(+) | |diff --git a/contrib/libpq/include/port.h b/contrib/libpq/include/port.h |index 2b27c650dc..cf789d55a5 100644 |--- a/contrib/libpq/include/port.h |+++ b/contrib/libpq/include/port.h -------------------------- Patching file contrib/libpq/include/port.h using Plan A... Hunk #1 succeeded at 195. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0050-contrib-llvm-project-Disable-locale-static-assertion.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 462873f8cc4421bc78ade6980413d66930d56a1b Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:33 +0000 |Subject: [PATCH 50/61] contrib/llvm-project: Disable locale static assertion | that fails on illumos | |--- | contrib/llvm-project/libcxx/include/__locale | 2 ++ | 1 file changed, 2 insertions(+) | |diff --git a/contrib/llvm-project/libcxx/include/__locale b/contrib/llvm-project/libcxx/include/__locale |index 40f9a3ff57..cdb5f1bd84 100644 |--- a/contrib/llvm-project/libcxx/include/__locale |+++ b/contrib/llvm-project/libcxx/include/__locale -------------------------- Patching file contrib/llvm-project/libcxx/include/__locale using Plan A... Hunk #1 succeeded at 549. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0051-contrib-llvm-project-Enable-xlocale-for-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From caf0f6064dd84cb4ae991ebf27edbc613ccf3d46 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Thu, 23 Nov 2023 09:30:26 +0000 |Subject: [PATCH 51/61] contrib/llvm-project: Enable xlocale for illumos | |--- | contrib/llvm-project-cmake/CMakeLists.txt | 6 ++++++ | contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp | 3 ++- | 2 files changed, 8 insertions(+), 1 deletion(-) | |diff --git a/contrib/llvm-project-cmake/CMakeLists.txt b/contrib/llvm-project-cmake/CMakeLists.txt |index 00992f4f79..3109d05b9e 100644 |--- a/contrib/llvm-project-cmake/CMakeLists.txt |+++ b/contrib/llvm-project-cmake/CMakeLists.txt -------------------------- Patching file contrib/llvm-project-cmake/CMakeLists.txt using Plan A... Hunk #1 succeeded at 75. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp b/contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp |index d25adcd21d..2e13391c3c 100644 |--- a/contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp |+++ b/contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp -------------------------- Patching file contrib/llvm-project/libcxx/src/support/solaris/xlocale.cpp using Plan A... Hunk #1 succeeded at 11. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0052-contrib-llvm-project-Missing-brace-and-prefer-std-ll.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From d141ba395a0c6160521987efc6bc7930e234e021 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:42 +0000 |Subject: [PATCH 52/61] contrib/llvm-project: Missing brace and prefer | std::llabs | |--- | contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h | 2 +- | contrib/llvm-project/libcxxabi/src/demangle/Utility.h | 2 +- | 2 files changed, 2 insertions(+), 2 deletions(-) | |diff --git a/contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h b/contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h |index 999102a811..f9a2376628 100644 |--- a/contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h |+++ b/contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h -------------------------- Patching file contrib/llvm-project/libcxx/include/__support/solaris/xlocale.h using Plan A... Hunk #1 succeeded at 43. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/llvm-project/libcxxabi/src/demangle/Utility.h b/contrib/llvm-project/libcxxabi/src/demangle/Utility.h |index db19dcac01..9131b319af 100644 |--- a/contrib/llvm-project/libcxxabi/src/demangle/Utility.h |+++ b/contrib/llvm-project/libcxxabi/src/demangle/Utility.h -------------------------- Patching file contrib/llvm-project/libcxxabi/src/demangle/Utility.h using Plan A... Hunk #1 succeeded at 134. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0053-contrib-llvm-project-Rename-tokens-due-to-regset.h-p.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From edd59f9c57f45e4195fdbfdb7a54dee5ceaf72da Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 12:43:50 +0000 |Subject: [PATCH 53/61] contrib/llvm-project: Rename tokens due to regset.h | pollution | |--- | .../llvm/include/llvm/ADT/SmallVector.h | 4 ++-- | .../llvm/include/llvm/IR/DebugInfoMetadata.h | 18 +++++++++--------- | 2 files changed, 11 insertions(+), 11 deletions(-) | |diff --git a/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h |index e34702bdbb..3421a9a794 100644 |--- a/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h |+++ b/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h -------------------------- Patching file contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h using Plan A... Hunk #1 succeeded at 735. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/llvm-project/llvm/include/llvm/IR/DebugInfoMetadata.h b/contrib/llvm-project/llvm/include/llvm/IR/DebugInfoMetadata.h |index db1d031a06..66244c5f9c 100644 |--- a/contrib/llvm-project/llvm/include/llvm/IR/DebugInfoMetadata.h |+++ b/contrib/llvm-project/llvm/include/llvm/IR/DebugInfoMetadata.h -------------------------- Patching file contrib/llvm-project/llvm/include/llvm/IR/DebugInfoMetadata.h using Plan A... Hunk #1 succeeded at 563. Hunk #2 succeeded at 584. Hunk #3 succeeded at 596. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0054-contrib-llvm-project-ignore-__sentinel.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 522215cec37420a3fed4cb19ecb13f75014b90fb Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:03 +0000 |Subject: [PATCH 54/61] contrib/llvm-project: ignore __sentinel | |--- | contrib/llvm-project/libcxx/include/__ranges/iota_view.h | 3 +++ | contrib/llvm-project/libcxx/include/__ranges/join_view.h | 3 +++ | 2 files changed, 6 insertions(+) | |diff --git a/contrib/llvm-project/libcxx/include/__ranges/iota_view.h b/contrib/llvm-project/libcxx/include/__ranges/iota_view.h |index e1f03bafa0..f0239c2f69 100644 |--- a/contrib/llvm-project/libcxx/include/__ranges/iota_view.h |+++ b/contrib/llvm-project/libcxx/include/__ranges/iota_view.h -------------------------- Patching file contrib/llvm-project/libcxx/include/__ranges/iota_view.h using Plan A... Hunk #1 succeeded at 37. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/llvm-project/libcxx/include/__ranges/join_view.h b/contrib/llvm-project/libcxx/include/__ranges/join_view.h |index b6fcce95ae..e7b1113c92 100644 |--- a/contrib/llvm-project/libcxx/include/__ranges/join_view.h |+++ b/contrib/llvm-project/libcxx/include/__ranges/join_view.h -------------------------- Patching file contrib/llvm-project/libcxx/include/__ranges/join_view.h using Plan A... Hunk #1 succeeded at 33. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0055-contrib-miniselect-cast-argument-to-log.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From d2dc0b43d91b70b9a540ffe398ae895e700e6537 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:45:47 +0000 |Subject: [PATCH 55/61] contrib/miniselect: cast argument to log | |--- | contrib/miniselect/include/miniselect/floyd_rivest_select.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/contrib/miniselect/include/miniselect/floyd_rivest_select.h b/contrib/miniselect/include/miniselect/floyd_rivest_select.h |index e7d5f80f57..fb643d600f 100644 |--- a/contrib/miniselect/include/miniselect/floyd_rivest_select.h |+++ b/contrib/miniselect/include/miniselect/floyd_rivest_select.h -------------------------- Patching file contrib/miniselect/include/miniselect/floyd_rivest_select.h using Plan A... Hunk #1 succeeded at 31. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0056-contrib-rocksdb-illumos-does-not-have-dirent-d_type-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From fe48b626b90ff8b9d46deec4a5f51be1fb921071 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:06 +0000 |Subject: [PATCH 56/61] contrib/rocksdb: illumos does not have dirent d_type | and does have thread_local | |--- | contrib/rocksdb/env/fs_posix.cc | 2 ++ | contrib/rocksdb/monitoring/perf_context.cc | 4 ---- | 2 files changed, 2 insertions(+), 4 deletions(-) | |diff --git a/contrib/rocksdb/env/fs_posix.cc b/contrib/rocksdb/env/fs_posix.cc |index a3e360806b..c57b8dbdbd 100644 |--- a/contrib/rocksdb/env/fs_posix.cc |+++ b/contrib/rocksdb/env/fs_posix.cc -------------------------- Patching file contrib/rocksdb/env/fs_posix.cc using Plan A... Hunk #1 succeeded at 635. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/rocksdb/monitoring/perf_context.cc b/contrib/rocksdb/monitoring/perf_context.cc |index a274288158..5a30ce2dd4 100644 |--- a/contrib/rocksdb/monitoring/perf_context.cc |+++ b/contrib/rocksdb/monitoring/perf_context.cc -------------------------- Patching file contrib/rocksdb/monitoring/perf_context.cc using Plan A... Hunk #1 succeeded at 14. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0057-contrib-rocksdb-re-order-structs-to-fix-compilation-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 0440f74175a41437135195689b02f82d2cddfab0 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:45 +0000 |Subject: [PATCH 57/61] contrib/rocksdb: re-order structs to fix compilation | under C++23 | |Without this shuffling around, compilation fails due to |forward declarations. |--- | .../block_based/block_based_table_builder.cc | 727 +++++++++--------- | .../trace/file_trace_reader_writer.h | 2 +- | .../write_batch_with_index_internal.h | 96 +-- | 3 files changed, 413 insertions(+), 412 deletions(-) | |diff --git a/contrib/rocksdb/table/block_based/block_based_table_builder.cc b/contrib/rocksdb/table/block_based/block_based_table_builder.cc |index bb8cfa14d6..751b1b903e 100644 |--- a/contrib/rocksdb/table/block_based/block_based_table_builder.cc |+++ b/contrib/rocksdb/table/block_based/block_based_table_builder.cc -------------------------- Patching file contrib/rocksdb/table/block_based/block_based_table_builder.cc using Plan A... Hunk #1 succeeded at 246. Hunk #2 succeeded at 469. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/rocksdb/utilities/trace/file_trace_reader_writer.h b/contrib/rocksdb/utilities/trace/file_trace_reader_writer.h |index a9eafa5af1..bf9d718654 100644 |--- a/contrib/rocksdb/utilities/trace/file_trace_reader_writer.h |+++ b/contrib/rocksdb/utilities/trace/file_trace_reader_writer.h -------------------------- Patching file contrib/rocksdb/utilities/trace/file_trace_reader_writer.h using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h b/contrib/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h |index b3360140bf..e019718fd6 100644 |--- a/contrib/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h |+++ b/contrib/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h -------------------------- Patching file contrib/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h using Plan A... Hunk #1 succeeded at 27. Hunk #2 succeeded at 275. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0058-contrib-s2geometry-Find-endian.h-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 1a42f1ee3a0545935a95c1ab549801221aae1661 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:03 +0000 |Subject: [PATCH 58/61] contrib/s2geometry: Find endian.h on illumos | |--- | contrib/s2geometry/src/s2/base/port.h | 2 +- | 1 file changed, 1 insertion(+), 1 deletion(-) | |diff --git a/contrib/s2geometry/src/s2/base/port.h b/contrib/s2geometry/src/s2/base/port.h |index 0efaba8424..f814891219 100644 |--- a/contrib/s2geometry/src/s2/base/port.h |+++ b/contrib/s2geometry/src/s2/base/port.h -------------------------- Patching file contrib/s2geometry/src/s2/base/port.h using Plan A... Hunk #1 succeeded at 149. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0059-contrib-s2geometry-use-floating-point-parameters-to-.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 21f3d7cd8776e06fe51182550baf79eca942353d Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:09 +0000 |Subject: [PATCH 59/61] contrib/s2geometry: use floating-point parameters to | sqrt() | |--- | contrib/s2geometry/src/s2/s2builder.cc | 4 +-- | .../src/s2/s2builderutil_snap_functions.cc | 14 ++++---- | .../src/s2/s2builderutil_snap_functions.h | 6 ++-- | contrib/s2geometry/src/s2/s2cap_test.cc | 2 +- | contrib/s2geometry/src/s2/s2edge_crosser.cc | 4 +-- | contrib/s2geometry/src/s2/s2edge_crossings.cc | 6 ++-- | contrib/s2geometry/src/s2/s2edge_distances.cc | 6 ++-- | .../src/s2/s2edge_distances_test.cc | 6 ++-- | .../s2geometry/src/s2/s2edge_tessellator.cc | 6 ++-- | .../src/s2/s2edge_tessellator_test.cc | 2 +- | .../src/s2/s2latlng_rect_bounder.cc | 12 +++---- | .../src/s2/s2latlng_rect_bounder_test.cc | 2 +- | contrib/s2geometry/src/s2/s2latlng_test.cc | 2 +- | contrib/s2geometry/src/s2/s2measures.cc | 2 +- | contrib/s2geometry/src/s2/s2metrics.cc | 30 ++++++++-------- | contrib/s2geometry/src/s2/s2polygon.cc | 2 +- | contrib/s2geometry/src/s2/s2predicates.cc | 34 +++++++++---------- | contrib/s2geometry/src/s2/s2predicates.h | 4 +-- | contrib/s2geometry/src/s2/s2testing.cc | 6 ++-- | contrib/s2geometry/src/s2/s2testing_test.cc | 2 +- | 20 files changed, 76 insertions(+), 76 deletions(-) | |diff --git a/contrib/s2geometry/src/s2/s2builder.cc b/contrib/s2geometry/src/s2/s2builder.cc |index 9ca2ca8579..ef7c78b7ec 100644 |--- a/contrib/s2geometry/src/s2/s2builder.cc |+++ b/contrib/s2geometry/src/s2/s2builder.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2builder.cc using Plan A... Hunk #1 succeeded at 301. Hunk #2 succeeded at 734. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2builderutil_snap_functions.cc b/contrib/s2geometry/src/s2/s2builderutil_snap_functions.cc |index 4fd712c59b..70ab414e2b 100644 |--- a/contrib/s2geometry/src/s2/s2builderutil_snap_functions.cc |+++ b/contrib/s2geometry/src/s2/s2builderutil_snap_functions.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2builderutil_snap_functions.cc using Plan A... Hunk #1 succeeded at 262. Hunk #2 succeeded at 276. Hunk #3 succeeded at 296. Hunk #4 succeeded at 304. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2builderutil_snap_functions.h b/contrib/s2geometry/src/s2/s2builderutil_snap_functions.h |index 9d42bc01ee..87f750d9f7 100644 |--- a/contrib/s2geometry/src/s2/s2builderutil_snap_functions.h |+++ b/contrib/s2geometry/src/s2/s2builderutil_snap_functions.h -------------------------- Patching file contrib/s2geometry/src/s2/s2builderutil_snap_functions.h using Plan A... Hunk #1 succeeded at 154. Hunk #2 succeeded at 199. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2cap_test.cc b/contrib/s2geometry/src/s2/s2cap_test.cc |index 8f62b3e526..5bd4a65113 100644 |--- a/contrib/s2geometry/src/s2/s2cap_test.cc |+++ b/contrib/s2geometry/src/s2/s2cap_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2cap_test.cc using Plan A... Hunk #1 succeeded at 227. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_crosser.cc b/contrib/s2geometry/src/s2/s2edge_crosser.cc |index 491d3d82b5..d8b12e92bb 100644 |--- a/contrib/s2geometry/src/s2/s2edge_crosser.cc |+++ b/contrib/s2geometry/src/s2/s2edge_crosser.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_crosser.cc using Plan A... Hunk #1 succeeded at 55. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_crossings.cc b/contrib/s2geometry/src/s2/s2edge_crossings.cc |index 32289d78fd..a6ef6de6c7 100644 |--- a/contrib/s2geometry/src/s2/s2edge_crossings.cc |+++ b/contrib/s2geometry/src/s2/s2edge_crossings.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_crossings.cc using Plan A... Hunk #1 succeeded at 437. Hunk #2 succeeded at 447. Hunk #3 succeeded at 526. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_distances.cc b/contrib/s2geometry/src/s2/s2edge_distances.cc |index eeebdbbad5..5f2756ebd2 100644 |--- a/contrib/s2geometry/src/s2/s2edge_distances.cc |+++ b/contrib/s2geometry/src/s2/s2edge_distances.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_distances.cc using Plan A... Hunk #1 succeeded at 264. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_distances_test.cc b/contrib/s2geometry/src/s2/s2edge_distances_test.cc |index b4847b7f06..08934d5f15 100644 |--- a/contrib/s2geometry/src/s2/s2edge_distances_test.cc |+++ b/contrib/s2geometry/src/s2/s2edge_distances_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_distances_test.cc using Plan A... Hunk #1 succeeded at 316. Hunk #2 succeeded at 508. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_tessellator.cc b/contrib/s2geometry/src/s2/s2edge_tessellator.cc |index a5e490651d..668efa2081 100644 |--- a/contrib/s2geometry/src/s2/s2edge_tessellator.cc |+++ b/contrib/s2geometry/src/s2/s2edge_tessellator.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_tessellator.cc using Plan A... Hunk #1 succeeded at 84. Hunk #2 succeeded at 136. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2edge_tessellator_test.cc b/contrib/s2geometry/src/s2/s2edge_tessellator_test.cc |index 09802c110d..50113a0a2b 100644 |--- a/contrib/s2geometry/src/s2/s2edge_tessellator_test.cc |+++ b/contrib/s2geometry/src/s2/s2edge_tessellator_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_tessellator_test.cc using Plan A... Hunk #1 succeeded at 355. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2latlng_rect_bounder.cc b/contrib/s2geometry/src/s2/s2latlng_rect_bounder.cc |index 7054f23e88..70c1cd9c2f 100644 |--- a/contrib/s2geometry/src/s2/s2latlng_rect_bounder.cc |+++ b/contrib/s2geometry/src/s2/s2latlng_rect_bounder.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2latlng_rect_bounder.cc using Plan A... Hunk #1 succeeded at 64. Hunk #2 succeeded at 114. Hunk #3 succeeded at 253. Hunk #4 succeeded at 273. Hunk #5 succeeded at 281. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2latlng_rect_bounder_test.cc b/contrib/s2geometry/src/s2/s2latlng_rect_bounder_test.cc |index bd17bbca15..0ec672f9b7 100644 |--- a/contrib/s2geometry/src/s2/s2latlng_rect_bounder_test.cc |+++ b/contrib/s2geometry/src/s2/s2latlng_rect_bounder_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2latlng_rect_bounder_test.cc using Plan A... Hunk #1 succeeded at 49. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2latlng_test.cc b/contrib/s2geometry/src/s2/s2latlng_test.cc |index 2c6f809330..a656197d3a 100644 |--- a/contrib/s2geometry/src/s2/s2latlng_test.cc |+++ b/contrib/s2geometry/src/s2/s2latlng_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2latlng_test.cc using Plan A... Hunk #1 succeeded at 144. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2measures.cc b/contrib/s2geometry/src/s2/s2measures.cc |index 42e36355a8..615955ccd7 100644 |--- a/contrib/s2geometry/src/s2/s2measures.cc |+++ b/contrib/s2geometry/src/s2/s2measures.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2measures.cc using Plan A... Hunk #1 succeeded at 80. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2metrics.cc b/contrib/s2geometry/src/s2/s2metrics.cc |index 0aacfa93ec..bd83883e45 100644 |--- a/contrib/s2geometry/src/s2/s2metrics.cc |+++ b/contrib/s2geometry/src/s2/s2metrics.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2metrics.cc using Plan A... Hunk #1 succeeded at 49. Hunk #2 succeeded at 63. Hunk #3 succeeded at 78. Hunk #4 succeeded at 96. Hunk #5 succeeded at 111. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2polygon.cc b/contrib/s2geometry/src/s2/s2polygon.cc |index a76cd385ed..411bd761f1 100644 |--- a/contrib/s2geometry/src/s2/s2polygon.cc |+++ b/contrib/s2geometry/src/s2/s2polygon.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2polygon.cc using Plan A... Hunk #1 succeeded at 1085. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2predicates.cc b/contrib/s2geometry/src/s2/s2predicates.cc |index 6564ddeab2..86fc63a6c3 100644 |--- a/contrib/s2geometry/src/s2/s2predicates.cc |+++ b/contrib/s2geometry/src/s2/s2predicates.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2predicates.cc using Plan A... Hunk #1 succeeded at 71. Hunk #2 succeeded at 340. Hunk #3 succeeded at 352. Hunk #4 succeeded at 598. Hunk #5 succeeded at 638. Hunk #6 succeeded at 689. Hunk #7 succeeded at 795. Hunk #8 succeeded at 860. Hunk #9 succeeded at 884. Hunk #10 succeeded at 1199. Hunk #11 succeeded at 1243. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2predicates.h b/contrib/s2geometry/src/s2/s2predicates.h |index 89f68a8d48..7312074ab5 100644 |--- a/contrib/s2geometry/src/s2/s2predicates.h |+++ b/contrib/s2geometry/src/s2/s2predicates.h -------------------------- Patching file contrib/s2geometry/src/s2/s2predicates.h using Plan A... Hunk #1 succeeded at 271. Hunk #2 succeeded at 282. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2testing.cc b/contrib/s2geometry/src/s2/s2testing.cc |index 0820f8efc0..ad9dece44e 100644 |--- a/contrib/s2geometry/src/s2/s2testing.cc |+++ b/contrib/s2geometry/src/s2/s2testing.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2testing.cc using Plan A... Hunk #1 succeeded at 432. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/contrib/s2geometry/src/s2/s2testing_test.cc b/contrib/s2geometry/src/s2/s2testing_test.cc |index 402a190535..824e3e2289 100644 |--- a/contrib/s2geometry/src/s2/s2testing_test.cc |+++ b/contrib/s2geometry/src/s2/s2testing_test.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2testing_test.cc using Plan A... Hunk #1 succeeded at 85. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0060-contrib-s2geometry-using-std-ldexp.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 008515a600c7fca1dea0fa2a4c55f6cc23581233 Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:47:48 +0000 |Subject: [PATCH 60/61] contrib/s2geometry: using std::ldexp | |--- | contrib/s2geometry/src/s2/s2edge_crossings.cc | 1 + | 1 file changed, 1 insertion(+) | |diff --git a/contrib/s2geometry/src/s2/s2edge_crossings.cc b/contrib/s2geometry/src/s2/s2edge_crossings.cc |index a6ef6de6c7..8e4f525af9 100644 |--- a/contrib/s2geometry/src/s2/s2edge_crossings.cc |+++ b/contrib/s2geometry/src/s2/s2edge_crossings.cc -------------------------- Patching file contrib/s2geometry/src/s2/s2edge_crossings.cc using Plan A... Hunk #1 succeeded at 43. Hmm... Ignoring the trailing garbage. done => Applying distribution patch 0061-contrib-zlib-ng-Use-posix_memalign-on-illumos.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From e40589a1aae3a2acb3b016598b0b4e334870ac0c Mon Sep 17 00:00:00 2001 |From: Oxide Computer Company |Date: Wed, 22 Nov 2023 11:46:00 +0000 |Subject: [PATCH 61/61] contrib/zlib-ng: Use posix_memalign on illumos | |--- | contrib/zlib-ng/zutil_p.h | 3 ++- | 1 file changed, 2 insertions(+), 1 deletion(-) | |diff --git a/contrib/zlib-ng/zutil_p.h b/contrib/zlib-ng/zutil_p.h |index 2a748df0c6..fdcb43c6f7 100644 |--- a/contrib/zlib-ng/zutil_p.h |+++ b/contrib/zlib-ng/zutil_p.h -------------------------- Patching file contrib/zlib-ng/zutil_p.h using Plan A... Hunk #1 succeeded at 12. Hmm... Ignoring the trailing garbage. done => Applying pkgsrc patches for clickhouse-23.8.7.24 => Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse/patches/patch-CMakeLists.txt => Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse/patches/patch-CMakeLists.txt Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD$ | |Use pkgsrc layout. | |--- CMakeLists.txt.orig 2024-06-18 08:24:26.840366038 +0000 |+++ CMakeLists.txt -------------------------- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 460. done => Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse/patches/patch-cmake_sunos_default__libs.cmake => Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse/patches/patch-cmake_sunos_default__libs.cmake Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD$ | |Handle out-of-srcdir builds. |pkgsrc cmake needs -lstdc++, OmniOS has different handling for -nodefaultlibs | |--- cmake/sunos/default_libs.cmake.orig 2024-06-18 14:06:23.203199547 +0000 |+++ cmake/sunos/default_libs.cmake -------------------------- Patching file cmake/sunos/default_libs.cmake using Plan A... Hunk #1 succeeded at 7. done ===> Creating toolchain wrappers for clickhouse-23.8.7.24 ===> Configuring for clickhouse-23.8.7.24 CFLAGS: -pipe -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -DHAVE_STRERROR_R -DSTRERROR_R_INT -fno-use-cxa-atexit -D__illumos__ CXXFLAGS: -pipe -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -DHAVE_STRERROR_R -DSTRERROR_R_INT -fno-use-cxa-atexit -D__illumos__ -fcxx-exceptions -fexceptions -frtti -D__illumos__ LDFLAGS: -Wl,-R/opt/local/lib CMAKE_C_FLAGS: CMAKE_CXX_FLAGS: CMAKE_EXE_LINKER_FLAGS: CMAKE_SHARED_LINKER_FLAGS: CMAKE_MODULE_LINKER_FLAGS: CMAKE_C_FLAGS_INIT: CMAKE_CXX_FLAGS_INIT: CMAKE_EXE_LINKER_FLAGS_INIT: CMAKE_MODULE_LINKER_FLAGS_INIT: -- The C compiler identification is Clang 19.1.7 -- The CXX compiler identification is Clang 19.1.7 -- The ASM compiler identification is Clang with GNU-like command-line -- Found assembler: /home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc -- Detecting C compiler ABI info -- Detecting C compiler ABI info - failed -- Check for working C compiler: /home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc -- Check for working C compiler: /home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc - broken CMake Error at /opt/local/share/cmake-3.31/Modules/CMakeTestCCompiler.cmake:67 (message): The C compiler "/home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc" is not able to compile a simple test program. It fails with the following output: Change Dir: '/home/pbulk/build-disk/extra/clickhouse/work/clickhouse-v23.8.7.24-lts/cmake-pkgsrc-build/CMakeFiles/CMakeScratch/TryCompile-07a4Bh' Run Build Command(s): /opt/local/bin/cmake -E env VERBOSE=1 /home/pbulk/build-disk/extra/clickhouse/work/.tools/bin/make -f Makefile cmTC_c88d8/fast /home/pbulk/build-disk/extra/clickhouse/work/.tools/bin/make -f CMakeFiles/cmTC_c88d8.dir/build.make CMakeFiles/cmTC_c88d8.dir/build Building C object CMakeFiles/cmTC_c88d8.dir/testCCompiler.c.o /home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc -pipe -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -DHAVE_STRERROR_R -DSTRERROR_R_INT -fno-use-cxa-atexit -D__illumos__ -MD -MT CMakeFiles/cmTC_c88d8.dir/testCCompiler.c.o -MF CMakeFiles/cmTC_c88d8.dir/testCCompiler.c.o.d -o CMakeFiles/cmTC_c88d8.dir/testCCompiler.c.o -c /home/pbulk/build-disk/extra/clickhouse/work/clickhouse-v23.8.7.24-lts/cmake-pkgsrc-build/CMakeFiles/CMakeScratch/TryCompile-07a4Bh/testCCompiler.c Linking C executable cmTC_c88d8 /opt/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_c88d8.dir/link.txt --verbose=1 ld: fatal: file crtbegin.o: open failed: No such file or directory ld: fatal: library -lssp_nonshared: not found ld: fatal: library -lssp: not found ld: fatal: library -lgcc_s: not found ld: fatal: library -lgcc: not found ld: fatal: file crtend.o: open failed: No such file or directory ld: fatal: file processing errors. No output written to cmTC_c88d8 clang: error: linker command failed with exit code 1 (use -v to see invocation) /home/pbulk/build-disk/extra/clickhouse/work/.cwrapper/bin/gcc -pipe -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -DHAVE_STRERROR_R -DSTRERROR_R_INT -fno-use-cxa-atexit -D__illumos__ -Wl,-R/opt/local/lib CMakeFiles/cmTC_c88d8.dir/testCCompiler.c.o -o cmTC_c88d8 *** Error code 1 Stop. make[1]: stopped making "CMakeFiles/cmTC_c88d8.dir/build" in /home/pbulk/build-disk/extra/clickhouse/work/clickhouse-v23.8.7.24-lts/cmake-pkgsrc-build/CMakeFiles/CMakeScratch/TryCompile-07a4Bh *** Error code 1 Stop. make: stopped making "cmTC_c88d8/fast" in /home/pbulk/build-disk/extra/clickhouse/work/clickhouse-v23.8.7.24-lts/cmake-pkgsrc-build/CMakeFiles/CMakeScratch/TryCompile-07a4Bh CMake will not be able to correctly generate this project. Call Stack (most recent call first): CMakeLists.txt:3 (project) -- Configuring incomplete, errors occurred! *** Error code 1 Stop. bmake[1]: stopped making "configure" in /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse *** Error code 1 Stop. bmake: stopped making "configure" in /data/jenkins/workspace/pkgsrc-trunk-x86_64/extra/clickhouse