thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to v3.7.3

Browse Source
This commit is contained in:
Robert Schulze 2024-09-08 12:57:37 +00:00
parent 483dd7eebe
commit e252bdc30d
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libarchive vendored

@ -1 +1 @@
Subproject commit 6468cd1f5c9b76e2c3b10cdd6938faf6b82823b6
Subproject commit 4fcc02d906cca4b9e21a78a833f1142a2689ec52

8
contrib/libarchive-cmake/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libarchive")
set(SRCS
set(SRCS
"${LIBRARY_DIR}/libarchive/archive_acl.c"
"${LIBRARY_DIR}/libarchive/archive_blake2sp_ref.c"
"${LIBRARY_DIR}/libarchive/archive_blake2s_ref.c"
@ -135,7 +135,7 @@ set(SRCS
)
add_library(_libarchive ${SRCS})
target_include_directories(_libarchive PUBLIC
target_include_directories(_libarchive PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
"${LIBRARY_DIR}/libarchive"
)
@ -157,7 +157,7 @@ if (TARGET ch_contrib::zlib)
endif()
if (TARGET ch_contrib::zstd)
target_compile_definitions(_libarchive PUBLIC HAVE_ZSTD_H=1 HAVE_LIBZSTD=1 HAVE_LIBZSTD_COMPRESSOR=1)
target_compile_definitions(_libarchive PUBLIC HAVE_ZSTD_H=1 HAVE_LIBZSTD=1 HAVE_ZSTD_compressStream=1)
target_link_libraries(_libarchive PRIVATE ch_contrib::zstd)
endif()
@ -179,4 +179,4 @@ if (OS_LINUX)
)
endif()
add_library(ch_contrib::libarchive ALIAS _libarchive)
add_library(ch_contrib::libarchive ALIAS _libarchive)

28
contrib/libarchive-cmake/config.h
View File

@ -334,16 +334,16 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */
/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.7.2"
#define BSDCPIO_VERSION_STRING "3.7.3"
/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.7.2"
#define BSDTAR_VERSION_STRING "3.7.3"
/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.7.2"
#define BSDCAT_VERSION_STRING "3.7.3"
/* Version number of bsdunzip */
#define BSDUNZIP_VERSION_STRING "3.7.2"
#define BSDUNZIP_VERSION_STRING "3.7.3"
/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
@ -753,6 +753,12 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
/* #undef HAVE_LIBPCREPOSIX */
/* Define to 1 if you have the `pcre2-8' library (-lpcre2-8). */
/* #undef HAVE_LIBPCRE2 */
/* Define to 1 if you have the `pcreposix' library (-lpcre2posix). */
/* #undef HAVE_LIBPCRE2POSIX */
/* Define to 1 if you have the `xml2' library (-lxml2). */
#define HAVE_LIBXML2 1
@ -768,9 +774,8 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `zstd' library (-lzstd). */
/* #undef HAVE_LIBZSTD */
/* Define to 1 if you have the `zstd' library (-lzstd) with compression
support. */
/* #undef HAVE_LIBZSTD_COMPRESSOR */
/* Define to 1 if you have the ZSTD_compressStream function. */
/* #undef HAVE_ZSTD_compressStream */
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@ -926,6 +931,9 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the <pcreposix.h> header file. */
/* #undef HAVE_PCREPOSIX_H */
/* Define to 1 if you have the <pcre2posix.h> header file. */
/* #undef HAVE_PCRE2POSIX_H */
/* Define to 1 if you have the `pipe' function. */
#define HAVE_PIPE 1
@ -1285,10 +1293,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST
/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3007002"
#define LIBARCHIVE_VERSION_NUMBER "3007003"
/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.7.2"
#define LIBARCHIVE_VERSION_STRING "3.7.3"
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
@ -1342,7 +1350,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */
/* Version number of package */
#define VERSION "3.7.2"
#define VERSION "3.7.3"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */