Skip to content

Commit 4c963a1

Browse files
authored
Merge pull request ClickHouse#87882 from ClickHouse/backport/25.8/87647
Backport ClickHouse#87647 to 25.8: Use `postgres` 18.0
2 parents 8a24750 + b341d36 commit 4c963a1

File tree

8 files changed

+328
-789
lines changed

8 files changed

+328
-789
lines changed

contrib/postgres

Submodule postgres updated 4464 files

contrib/postgres-cmake/CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ set(LIBPQ_CMAKE_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/postgres-cmake")
77
set(SRCS
88
"${LIBPQ_SOURCE_DIR}/fe-auth.c"
99
"${LIBPQ_SOURCE_DIR}/fe-auth-scram.c"
10+
"${LIBPQ_SOURCE_DIR}/fe-auth-oauth.c"
11+
"${LIBPQ_SOURCE_DIR}/fe-cancel.c"
1012
"${LIBPQ_SOURCE_DIR}/fe-connect.c"
1113
"${LIBPQ_SOURCE_DIR}/fe-exec.c"
1214
"${LIBPQ_SOURCE_DIR}/fe-lobj.c"
@@ -45,8 +47,6 @@ set(SRCS
4547
"${POSTGRES_SOURCE_DIR}/src/common/logging.c"
4648

4749
"${POSTGRES_SOURCE_DIR}/src/port/snprintf.c"
48-
"${POSTGRES_SOURCE_DIR}/src/port/strlcat.c"
49-
"${POSTGRES_SOURCE_DIR}/src/port/strlcpy.c"
5050
"${POSTGRES_SOURCE_DIR}/src/port/strerror.c"
5151
"${POSTGRES_SOURCE_DIR}/src/port/inet_net_ntop.c"
5252
"${POSTGRES_SOURCE_DIR}/src/port/getpeereid.c"
@@ -55,17 +55,20 @@ set(SRCS
5555
"${POSTGRES_SOURCE_DIR}/src/port/pg_strong_random.c"
5656
"${POSTGRES_SOURCE_DIR}/src/port/pgstrcasecmp.c"
5757
"${POSTGRES_SOURCE_DIR}/src/port/pg_bitutils.c"
58-
"${POSTGRES_SOURCE_DIR}/src/port/thread.c"
5958
"${POSTGRES_SOURCE_DIR}/src/port/path.c"
6059
)
6160

61+
if(NOT OS_DARWIN)
62+
set(SRCS ${SRCS}
63+
"${POSTGRES_SOURCE_DIR}/src/port/strlcat.c"
64+
"${POSTGRES_SOURCE_DIR}/src/port/strlcpy.c"
65+
)
66+
endif()
67+
6268
add_library(_libpq ${SRCS})
6369

64-
add_definitions(-DHAVE_BIO_METH_NEW)
65-
add_definitions(-DHAVE_HMAC_CTX_NEW)
66-
add_definitions(-DHAVE_HMAC_CTX_FREE)
67-
add_definitions(-DHAVE_OPENSSL_INIT_SSL)
68-
add_definitions(-DHAVE_ASN1_STRING_GET0_DATA)
70+
add_definitions(-DFRONTEND)
71+
add_definitions(-D_GNU_SOURCE)
6972
add_definitions(-DOPENSSL_NO_ENGINE)
7073

7174
target_include_directories (_libpq SYSTEM PUBLIC ${LIBPQ_SOURCE_DIR})

0 commit comments

Comments
 (0)