-
Notifications
You must be signed in to change notification settings - Fork 1k
V3.0.2 merge upgrade deps add new distros #5033
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
d81aaa3
4ab0ad9
5bb5d87
9e761f0
52a3418
6b14554
306b70b
c919529
3dcb5ca
6b6a951
0b815e3
b66df68
730fc4c
765eaa8
9f9a741
eabbe1f
4fac35c
b0a8016
8fcd0c3
1ac85b0
d439ecd
64c388a
fffb05f
308c205
2c82ae7
5af4304
6eaf124
0c98b14
a0780ac
7b24499
7ab0932
28f15b5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,8 @@ endif | |
UNAME_S := $(shell uname -s) | ||
UNAME_M := $(shell uname -m) | ||
|
||
DISTRO := $(shell grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') | ||
DISTRO := $(shell grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"' | cut -d' ' -f1 | cut -d- -f1) | ||
DISTVERS := $(shell grep '^VERSION=' /etc/os-release | cut -d= -f2 | tr -d '"' | cut -d' ' -f1 | cut -d. -f1) | ||
|
||
CENTOSVER := Unknown | ||
ifneq (,$(wildcard /etc/system-release)) | ||
|
@@ -45,7 +46,28 @@ endif | |
STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) | ||
|
||
|
||
targets := check_openssl_version libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre lz4 cityhash microhttpd curl ev libhttpserver libinjection prometheus-cpp postgresql libusual libscram | ||
targets := check_openssl_version \ | ||
libconfig \ | ||
libdaemon \ | ||
jemalloc \ | ||
mariadb_client \ | ||
re2 \ | ||
sqlite3 \ | ||
pcre \ | ||
lz4 \ | ||
cityhash \ | ||
microhttpd \ | ||
curl \ | ||
ev \ | ||
libhttpserver \ | ||
libinjection \ | ||
prometheus-cpp \ | ||
postgresql \ | ||
libusual \ | ||
libscram \ | ||
json \ | ||
abseil | ||
|
||
ifeq ($(UNAME_S),Linux) | ||
targets += coredumper | ||
endif | ||
|
@@ -60,9 +82,13 @@ default: $(targets) | |
|
||
### deps targets | ||
|
||
include ../common_mk/openssl_flags.mk | ||
include ../common_mk/openssl_version_check.mk | ||
|
||
|
||
libinjection/libinjection/src/libinjection.a: | ||
cd libinjection && rm -rf libinjection-*/ || true | ||
cd libinjection && tar -zxf libinjection-3.10.0.tar.gz | ||
cd libinjection && tar -zxf libinjection-*.tar.gz | ||
ifneq ($(CENTOSVER),6) | ||
cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff | ||
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch | ||
|
@@ -76,8 +102,6 @@ endif | |
|
||
libinjection: libinjection/libinjection/src/libinjection.a | ||
|
||
include ../common_mk/openssl_flags.mk | ||
include ../common_mk/openssl_version_check.mk | ||
|
||
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a | ||
cd libhttpserver && rm -rf libhttpserver-*/ || true | ||
|
@@ -114,26 +138,28 @@ coredumper/coredumper/src/libcoredumper.a: | |
cd coredumper/coredumper && patch -p1 < ../includes.patch | ||
cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug | ||
cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
||
coredumper: coredumper/coredumper/src/libcoredumper.a | ||
|
||
curl/curl/lib/.libs/libcurl.a: | ||
|
||
|
||
curl/curl/local/lib/libcurl.a: | ||
cd curl && rm -rf curl-*/ || true | ||
cd curl && tar -zxf curl-*.tar.gz | ||
# cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} | ||
cd curl/curl && autoreconf -fi | ||
ifeq ($(UNAME_S),Darwin) | ||
cd curl/curl && patch configure < ../configure.patch | ||
endif | ||
cd curl/curl && CPPFLAGS="-I$(SSL_IDIR)" LDFLAGS="$(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)" ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl --enable-shared=yes | ||
cd curl/curl && CPPFLAGS="-I$(SSL_IDIR)" LDFLAGS="$(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)" ./configure --prefix=$(abspath ./curl/curl/local) --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl --enable-shared=yes | ||
cd curl/curl && CFLAGS=-fPIC CC=${CC} CXX=${CXX} ${MAKE} | ||
cd curl/curl && ${MAKE} install | ||
Comment on lines
+153
to
+155
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
curl: curl/curl/lib/.libs/libcurl.a | ||
curl: curl/curl/local/lib/libcurl.a | ||
|
||
|
||
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: | ||
cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true | ||
cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz | ||
# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch | ||
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
||
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a | ||
|
@@ -156,20 +182,21 @@ lz4/lz4/lib/liblz4.a: | |
lz4: lz4/lz4/lib/liblz4.a | ||
|
||
|
||
clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: | ||
clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a: abseil | ||
cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true | ||
cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz | ||
cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp | ||
cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch | ||
cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . | ||
cd clickhouse-cpp && tar -zxf clickhouse-cpp-*.tar.gz | ||
cd clickhouse-cpp/clickhouse-cpp && patch -p0 < ../fix_ciso646.patch | ||
cd clickhouse-cpp/clickhouse-cpp && cmake . \ | ||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
-DCMAKE_PREFIX_PATH=$(abspath abseil/abseil-cpp/local) | ||
Comment on lines
+189
to
+191
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
||
clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a | ||
clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a | ||
|
||
|
||
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: | ||
cd libdaemon && rm -rf libdaemon-*/ || true | ||
cd libdaemon && tar -zxf libdaemon-0.14.tar.gz | ||
cd libdaemon && tar -zxf libdaemon-*.tar.gz | ||
cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch | ||
cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples | ||
cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
@@ -179,7 +206,7 @@ libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a | |
|
||
jemalloc/jemalloc/lib/libjemalloc.a: | ||
cd jemalloc && rm -rf jemalloc-*/ || true | ||
cd jemalloc && tar --no-same-owner -jxf jemalloc-5.2.0.tar.bz2 | ||
cd jemalloc && tar --no-same-owner -jxf jemalloc-*.tar.bz2 | ||
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch | ||
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch | ||
cd jemalloc/jemalloc && patch -p0 < ../nothrow.patch | ||
|
@@ -192,7 +219,7 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a | |
|
||
mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: | ||
cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true | ||
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz | ||
cd mariadb-client-library && tar -zxf mariadb-connector-c-*-src.tar.gz | ||
cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch | ||
cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . | ||
ifeq ($(PROXYDEBUG),1) | ||
|
@@ -234,6 +261,8 @@ endif | |
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_rpl.patch | ||
cd mariadb-client-library/mariadb_client && patch -p0 < ../cmakelists.txt.patch | ||
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.metadata_column_check.patch | ||
cd mariadb-client-library/mariadb_client && patch -p0 < ../fix_bool.patch | ||
|
||
cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient | ||
# cd mariadb-client-library/mariadb_client/include && make my_config.h | ||
|
||
|
@@ -243,22 +272,23 @@ mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclien | |
sqlite3/sqlite3/sqlite3.o: | ||
cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true | ||
cd sqlite3 && tar -zxf sqlite-amalgamation-*.tar.gz | ||
cd sqlite3/sqlite3 && patch -p1 < ../from_unixtime.patch | ||
cd sqlite3/sqlite3 && patch sqlite3.c < ../sqlite3.c-multiplication-overflow.patch | ||
cd sqlite3/sqlite3 && patch -p0 < ../from_unixtime.patch | ||
cd sqlite3/sqlite3 && patch -p0 < ../sqlite3_pass_exts.patch | ||
cd sqlite3/sqlite3 && patch -p0 < ../throw.patch | ||
cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -fPIC -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1 -DSQLITE_DLL=1 | ||
cd sqlite3/sqlite3 && ${CC} -shared -o libsqlite3.so sqlite3.o | ||
|
||
sqlite3: sqlite3/sqlite3/sqlite3.o | ||
|
||
libconfig/libconfig/lib/.libs/libconfig++.a: | ||
|
||
libconfig/libconfig/out/libconfig++.a: | ||
cd libconfig && rm -rf libconfig-*/ || true | ||
cd libconfig && tar -zxf libconfig-*.tar.gz | ||
cd libconfig/libconfig && ./configure --disable-examples | ||
cd libconfig/libconfig && cmake -DBUILD_SHARED_LIBS=0 -DBUILD_EXAMPLES=0 -DBUILD_TESTS=0 -DBUILD_FUZZERS=0 . | ||
cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
||
libconfig: libconfig/libconfig/lib/.libs/libconfig++.a | ||
|
||
libconfig: libconfig/libconfig/out/libconfig++.a | ||
|
||
|
||
prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: | ||
|
@@ -267,7 +297,7 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: | |
cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-*.tar.gz -C prometheus-cpp/3rdparty/civetweb | ||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch | ||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch | ||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch | ||
# cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch | ||
cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF | ||
cd prometheus-cpp/prometheus-cpp && CC=${CC} CXX=${CXX} ${MAKE} | ||
|
||
|
@@ -301,6 +331,7 @@ pcre/pcre/.libs/libpcre.a: | |
|
||
pcre: pcre/pcre/.libs/libpcre.a | ||
|
||
|
||
postgresql/postgresql/src/interfaces/libpq/libpq.a: | ||
cd postgresql && rm -rf postgresql-*/ || true | ||
cd postgresql && tar -zxf postgresql-*.tar.gz | ||
|
@@ -314,6 +345,7 @@ postgresql/postgresql/src/interfaces/libpq/libpq.a: | |
|
||
postgresql: postgresql/postgresql/src/interfaces/libpq/libpq.a | ||
|
||
|
||
libusual/libusual/.libs/libusual.a: | ||
cd libusual && rm -rf libusual-*/ || true | ||
cd libusual && tar -zxf libusual-*.tar.gz | ||
|
@@ -323,12 +355,40 @@ libusual/libusual/.libs/libusual.a: | |
|
||
libusual: libusual/libusual/.libs/libusual.a | ||
|
||
|
||
libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a | ||
cd libscram && rm -rf lib/* || true | ||
cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR="$(SSL_IDIR)" POSTGRESQL_DIR="$(shell pwd)/postgresql/postgresql/" | ||
|
||
libscram: libscram/lib/libscram.a | ||
|
||
|
||
json/json/include/nlohmann/json.hpp: | ||
cd json && rm -rf json-*/ || true | ||
cd json && tar -zxf json-*.tar.gz | ||
cd json/json && cmake . | ||
|
||
json: json/json/include/nlohmann/json.hpp | ||
|
||
|
||
abseil/abseil-cpp/local/lib/libabsl.a: | ||
cd abseil && rm -rf abseil-cpp-*/ || true | ||
cd abseil && tar -zxf abseil-cpp-*.tar.gz | ||
cd abseil/abseil-cpp && mkdir -p build | ||
ifneq (,$(filter $(DISTRO)$(DISTVERS),almalinux8 opensuse15)) | ||
cd abseil/abseil-cpp && patch -p0 < ../constexpr.patch | ||
endif | ||
cd abseil/abseil-cpp/build && cmake .. -DCMAKE_CXX_FLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' -DCMAKE_INSTALL_PREFIX=../local -DBUILD_TESTING=OFF | ||
cd abseil/abseil-cpp/build && CC=${CC} CXX=${CXX} ${MAKE} | ||
cd abseil/abseil-cpp/build && ${MAKE} install | ||
cd abseil/abseil-cpp/local && ln -fsT lib64 lib || true | ||
#cd abseil/abseil-cpp/local/lib && ${AR} -crs --thin libabsl.a *.a # older ar doesn't support --thin | ||
cd abseil/abseil-cpp/local/lib && ls libabsl_*.a | xargs -n1 ${AR} -x | ||
cd abseil/abseil-cpp/local/lib && ${AR} -crs libabsl.a *.o && rm *.o | ||
|
||
abseil: abseil/abseil-cpp/local/lib/libabsl.a | ||
|
||
|
||
### clean targets | ||
|
||
cleanpart: | ||
|
@@ -348,7 +408,7 @@ cleanall: | |
cd re2 && rm -rf re2-*/ || true | ||
cd pcre && rm -rf pcre-*/ || true | ||
cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true | ||
cd clickhouse-cpp/ && rm -rf clickhouse-cpp-* || true | ||
cd clickhouse-cpp/ && rm -rf clickhouse-cpp-*/ || true | ||
cd lz4 && rm -rf lz4-*/ || true | ||
cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true | ||
cd curl && rm -rf curl-*/ || true | ||
|
@@ -360,5 +420,6 @@ cleanall: | |
cd postgresql && rm -rf postgresql-*/ || true | ||
cd libusual && rm -rf libusual-*/ || true | ||
cd libscram && rm -rf lib/* obj/* || true | ||
cd json && rm -rf json-*/ || true | ||
cd abseil && rm -rf abseil-cpp-*/ || true | ||
.PHONY: cleanall | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
abseil-cpp-20250512.0/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
--- absl/time/time.h 2025-05-12 17:41:36.000000000 +0000 | ||
+++ ../time.h 2025-06-15 22:04:19.463661983 +0000 | ||
@@ -620,9 +620,9 @@ | ||
// | ||
// absl::Duration d = absl::Milliseconds(1500); | ||
// int64_t isec = absl::ToInt64Seconds(d); // isec == 1 | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Nanoseconds(Duration d); | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Microseconds(Duration d); | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Milliseconds(Duration d); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Nanoseconds(Duration d); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Microseconds(Duration d); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Milliseconds(Duration d); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Seconds(Duration d); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Minutes(Duration d); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Hours(Duration d); | ||
@@ -964,9 +964,9 @@ | ||
// | ||
// Creates an `absl::Time` from a variety of other representations. See | ||
// https://unicode-org.github.io/icu/userguide/datetime/universaltimescale.html | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixNanos(int64_t ns); | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixMicros(int64_t us); | ||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixMillis(int64_t ms); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixNanos(int64_t ns); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixMicros(int64_t us); | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixMillis(int64_t ms); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixSeconds(int64_t s); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromTimeT(time_t t); | ||
ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUDate(double udate); | ||
@@ -1844,15 +1844,15 @@ | ||
return time_internal::FromChrono(d); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixNanos(int64_t ns) { | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixNanos(int64_t ns) { | ||
return time_internal::FromUnixDuration(Nanoseconds(ns)); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixMicros(int64_t us) { | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixMicros(int64_t us) { | ||
return time_internal::FromUnixDuration(Microseconds(us)); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixMillis(int64_t ms) { | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION Time FromUnixMillis(int64_t ms) { | ||
return time_internal::FromUnixDuration(Milliseconds(ms)); | ||
} | ||
|
||
@@ -1864,7 +1864,7 @@ | ||
return time_internal::FromUnixDuration(Seconds(t)); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Nanoseconds(Duration d) { | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Nanoseconds(Duration d) { | ||
if (time_internal::GetRepHi(d) >= 0 && | ||
time_internal::GetRepHi(d) >> 33 == 0) { | ||
return (time_internal::GetRepHi(d) * 1000 * 1000 * 1000) + | ||
@@ -1873,7 +1873,7 @@ | ||
return d / Nanoseconds(1); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Microseconds( | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Microseconds( | ||
Duration d) { | ||
if (time_internal::GetRepHi(d) >= 0 && | ||
time_internal::GetRepHi(d) >> 43 == 0) { | ||
@@ -1884,7 +1884,7 @@ | ||
return d / Microseconds(1); | ||
} | ||
|
||
-ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Milliseconds( | ||
+ABSL_ATTRIBUTE_CONST_FUNCTION int64_t ToInt64Milliseconds( | ||
Duration d) { | ||
if (time_internal::GetRepHi(d) >= 0 && | ||
time_internal::GetRepHi(d) >> 53 == 0) { |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
clickhouse-cpp-2.3.0 | ||
clickhouse-cpp-2.5.1/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
tar
command extracts the archive without specifying a target directory. This could lead to files being extracted in the current directory, potentially mixing with existing files. It's safer to extract to a subdirectory to keep things organized. Consider adding-C libinjection
to the tar command to extract the contents into thelibinjection
directory.