Skip to content

Commit 0da228b

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #1204 from hs-liuxh/master
Sync IvorySQL with PG master: 2025-06-29 to 2025-08-02
2 parents cfe2fad + 2884c03 commit 0da228b

File tree

634 files changed

+19917
-15212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

634 files changed

+19917
-15212
lines changed

‎.cirrus.tasks.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -938,14 +938,11 @@ task:
938938
# - Don't use ccache, the files are uncacheable, polluting ccache's
939939
# cache
940940
# - Use -fmax-errors, as particularly cpluspluscheck can be very verbose
941-
# - XXX have to disable ICU to avoid errors:
942-
# https://postgr.es/m/20220323002024.f2g6tivduzrktgfa%40alap3.anarazel.de
943941
###
944942
always:
945943
headers_headerscheck_script: |
946944
time ./configure \
947945
${LINUX_CONFIGURE_FEATURES} \
948-
--without-icu \
949946
--quiet \
950947
CC="gcc" CXX"=g++" CLANG="clang-16"
951948
make -s -j${BUILD_JOBS} clean

‎.git-blame-ignore-revs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@
1414
#
1515
# $ git log --pretty=format:"%H # %cd%n# %s" $PGINDENTGITHASH -1 --date=iso
1616

17+
1d1612aec7688139e1a5506df1366b4b6a69605d # 2025-07-29 09:10:41 -0400
18+
# Run pgindent.
19+
20+
73873805fb3627cb23937c750fa83ffd8f16fc6c # 2025-07-25 16:36:44 -0400
21+
# Run pgindent on the changes of the previous patch.
22+
23+
9e345415bcd3c4358350b89edfd710469b8bfaf9 # 2025-07-01 15:23:07 +0200
24+
# Fix indentation in pg_numa code
25+
1726
b27644bade0348d0dafd3036c47880a349fe9332 # 2025-06-15 13:04:24 -0400
1827
# Sync typedefs.list with the buildfarm.
1928

‎config/llvm.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# -----------------
55
#
66
# Look for the LLVM installation, check that it's new enough, set the
7-
# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH} and LDFLAGS
7+
# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH,LIBS}
88
# variables. Also verify that CLANG is available, to transform C
99
# into bitcode.
1010
#
@@ -55,7 +55,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
5555
5656
for pgac_option in `$LLVM_CONFIG --ldflags`; do
5757
case $pgac_option in
58-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
58+
-L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
5959
esac
6060
done
6161

‎config/programs.m4‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,20 +284,26 @@ AC_DEFUN([PGAC_CHECK_STRIP],
284284

285285
AC_DEFUN([PGAC_CHECK_LIBCURL],
286286
[
287+
# libcurl compiler/linker flags are kept separate from the global flags, so
288+
# they have to be added back temporarily for the following tests.
289+
pgac_save_CPPFLAGS=$CPPFLAGS
290+
pgac_save_LDFLAGS=$LDFLAGS
291+
pgac_save_LIBS=$LIBS
292+
293+
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
294+
LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
295+
287296
AC_CHECK_HEADER(curl/curl.h, [],
288297
[AC_MSG_ERROR([header file <curl/curl.h> is required for --with-libcurl])])
298+
299+
# LIBCURL_LDLIBS is determined here. Like the compiler flags, it should not
300+
# pollute the global LIBS setting.
289301
AC_CHECK_LIB(curl, curl_multi_init, [
290302
AC_DEFINE([HAVE_LIBCURL], [1], [Define to 1 if you have the `curl' library (-lcurl).])
291303
AC_SUBST(LIBCURL_LDLIBS, -lcurl)
292304
],
293305
[AC_MSG_ERROR([library 'curl' does not provide curl_multi_init])])
294306
295-
pgac_save_CPPFLAGS=$CPPFLAGS
296-
pgac_save_LDFLAGS=$LDFLAGS
297-
pgac_save_LIBS=$LIBS
298-
299-
CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
300-
LDFLAGS="$LIBCURL_LDFLAGS $LDFLAGS"
301307
LIBS="$LIBCURL_LDLIBS $LIBS"
302308
303309
# Check to see whether the current platform supports threadsafe Curl

0 commit comments

Comments
 (0)