This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 983aa85ee29 Fix conflict for configure.ac
983aa85ee29 is described below
commit 983aa85ee299713111031728d26118449dccf34a
Author: Jinbao Chen <chenjinbao1...@gmail.com>
AuthorDate: Wed Jul 16 16:31:33 2025 +0800
Fix conflict for configure.ac
---
configure.ac | 96 ++++--------------------------------------------------------
1 file changed, 6 insertions(+), 90 deletions(-)
diff --git a/configure.ac b/configure.ac
index aa8827543a8..bd1c69a7025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,28 +17,18 @@ dnl Read the Autoconf manual for details.
dnl
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
-<<<<<<< HEAD
dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
dnl variable with the merge conflict from the AC_INIT() statement.
AC_INIT([Apache Cloudberry], [2.0.0-devel], [d...@cloudberry.apache.org], [],
[https://cloudberry.apache.org/])
-[PG_PACKAGE_VERSION=14.4]
+[PG_PACKAGE_VERSION=16.9]
AC_SUBST(PG_PACKAGE_VERSION)
dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf
version 2.69 is required.
dnl Untested combinations of 'autoconf' and PostgreSQL versions are not
dnl recommended. You can remove the check from 'configure.in' but it is then
dnl your responsibility whether the result works or not.])])
-AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group])
-=======
-AC_INIT([PostgreSQL], [16.9], [pgsql-b...@lists.postgresql.org], [],
[https://www.postgresql.org/])
-
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version
2.69 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
-recommended. You can remove the check from 'configure.ac' but it is then
-your responsibility whether the result works or not.])])
AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group])
->>>>>>> REL_16_9
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
AC_PREFIX_DEFAULT(/usr/local/cbdb)
@@ -636,27 +626,13 @@ if test "$GCC" = yes -a "$ICC" = no; then
CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
fi
# Remove clang 12+'s compound-token-split-by-macro, as this causes a lot
-<<<<<<< HEAD
# of warnings when building plperl because of Perl. Like previously, test
# for the positive form and add the negative form
-=======
- # of warnings when building plperl because of usages in the Perl headers.
->>>>>>> REL_16_9
NOT_THE_CFLAGS=""
PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
if test -n "$NOT_THE_CFLAGS"; then
CFLAGS="$CFLAGS -Wno-compound-token-split-by-macro"
fi
-<<<<<<< HEAD
- # Similarly remove clang 15+'s deprecated-non-prototype, as it warns about
- # tree-walking APIs that we can't reasonably change in the back branches.
- NOT_THE_CFLAGS=""
- PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wdeprecated-non-prototype])
- if test -n "$NOT_THE_CFLAGS"; then
- CFLAGS="$CFLAGS -Wno-deprecated-non-prototype"
- fi
-=======
->>>>>>> REL_16_9
# Similarly disable useless truncation warnings from gcc 8+
NOT_THE_CFLAGS=""
PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wformat-truncation])
@@ -744,19 +720,6 @@ if test "$with_llvm" = yes ; then
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS,
[-fexcess-precision=standard])
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS,
[-fexcess-precision=standard])
-<<<<<<< HEAD
-=======
- PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-Xclang
-no-opaque-pointers])
- PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-Xclang
-no-opaque-pointers])
-
- # Ideally bitcode should perhaps match $CC's use, or not, of outline atomic
- # functions, but for now we err on the side of suppressing them in bitcode,
- # because we can't assume they're available at runtime. This affects aarch64
- # builds using the basic armv8-a ISA without LSE support.
- PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-mno-outline-atomics])
- PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANG, BITCODE_CXXFLAGS,
[-mno-outline-atomics])
-
->>>>>>> REL_16_9
NOT_THE_CFLAGS=""
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS,
[-Wunused-command-line-argument])
if test -n "$NOT_THE_CFLAGS"; then
@@ -768,14 +731,6 @@ if test "$with_llvm" = yes ; then
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
fi
NOT_THE_CFLAGS=""
-<<<<<<< HEAD
- PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS,
[-Wdeprecated-non-prototype])
- if test -n "$NOT_THE_CFLAGS"; then
- BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-deprecated-non-prototype"
- fi
- NOT_THE_CFLAGS=""
-=======
->>>>>>> REL_16_9
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wformat-truncation])
if test -n "$NOT_THE_CFLAGS"; then
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
@@ -1370,7 +1325,6 @@ if test "$with_lz4" = yes; then
fi
#
-<<<<<<< HEAD
# bzip2
#
PGAC_ARG_BOOL(with, libbz2, yes,
@@ -1383,18 +1337,17 @@ AC_SUBST(with_libbz2)
AC_MSG_CHECKING([whether to build with ZSTD support])
PGAC_ARG_BOOL(with, zstd, yes, [do not build with Zstandard],
[AC_DEFINE([USE_ZSTD], 1, [Define to build with zstd support.
(--with-zstd)])])
-=======
+
# ZSTD
#
AC_MSG_CHECKING([whether to build with ZSTD support])
PGAC_ARG_BOOL(with, zstd, no, [build with ZSTD support],
[AC_DEFINE([USE_ZSTD], 1, [Define to 1 to build with ZSTD
support. (--with-zstd)])])
->>>>>>> REL_16_9
+
AC_MSG_RESULT([$with_zstd])
AC_SUBST(with_zstd)
if test "$with_zstd" = yes; then
-<<<<<<< HEAD
dnl zstd_errors.h was renamed from error_public.h in v1.4.0
PKG_CHECK_MODULES([ZSTD], [libzstd >= 1.4.0])
fi
@@ -1463,7 +1416,6 @@ else
fi])
AC_SUBST(ELF_SYS)
-=======
PKG_CHECK_MODULES(ZSTD, libzstd >= 1.4.0)
# We only care about -I, -D, and -L switches;
# note that -lzstd will be added by AC_CHECK_LIB below.
@@ -1478,7 +1430,7 @@ AC_SUBST(ELF_SYS)
esac
done
fi
->>>>>>> REL_16_9
+
#
# Assignments
#
@@ -1489,7 +1441,6 @@ LDFLAGS="$LDFLAGS $LIBDIRS"
AC_ARG_VAR(LDFLAGS_EX, [extra linker flags for linking executables only])
AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only])
-<<<<<<< HEAD
AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
@@ -1497,8 +1448,6 @@ PGAC_PROG_LD
AC_SUBST(LD)
AC_SUBST(with_gnu_ld)
AC_PROG_RANLIB
-=======
->>>>>>> REL_16_9
PGAC_CHECK_STRIP
AC_CHECK_TOOL(AR, ar, ar)
if test "$PORTNAME" = "win32"; then
@@ -1840,13 +1789,10 @@ if test "$with_lz4" = yes ; then
AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is
required for LZ4 support])])
fi
-<<<<<<< HEAD
-=======
if test "$with_zstd" = yes ; then
AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is
required for ZSTD support])])
fi
->>>>>>> REL_16_9
# Note: We can test for libldap_r only after we know PTHREAD_LIBS;
# also, on AIX, we may need to have openssl in LIBS for this step.
if test "$with_ldap" = yes ; then
@@ -1946,7 +1892,6 @@ AC_CHECK_HEADERS(m4_normalize([
sys/personality.h
sys/prctl.h
sys/procctl.h
-<<<<<<< HEAD
sys/pstat.h
sys/resource.h
sys/select.h
@@ -1955,17 +1900,13 @@ AC_CHECK_HEADERS(m4_normalize([
sys/signalfd.h
sys/sockio.h
sys/tas.h
+ sys/ucred.h
sys/uio.h
sys/un.h
-=======
- sys/signalfd.h
- sys/ucred.h
->>>>>>> REL_16_9
termios.h
ucred.h
]))
-<<<<<<< HEAD
# GPDB additions.
AC_CHECK_HEADERS([ execinfo.h ])
@@ -1990,8 +1931,6 @@ AC_CHECK_HEADERS(netinet/tcp.h, [], [],
#include <netinet/in.h>
])
-=======
->>>>>>> REL_16_9
if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then
AC_CHECK_HEADERS(readline/readline.h, [],
[AC_CHECK_HEADERS(readline.h, [],
@@ -2048,7 +1987,6 @@ failure. It is possible the compiler isn't looking in
the proper directory.
Use --without-zlib to disable zlib support.])])
fi
-<<<<<<< HEAD
# Check for bzlib.h
if test "$with_libbz2" = yes ; then
AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR([header file <bzlib.h> is
required for bzip2 support])], [])
@@ -2064,9 +2002,7 @@ if test "$enable_external_fts" = yes; then
AC_CHECK_HEADER(jansson.h, [], [AC_MSG_ERROR([header file <jansson.h> is
required for ETCD support])])
fi
-=======
PGAC_PATH_PROGS(LZ4, lz4)
->>>>>>> REL_16_9
if test "$with_lz4" = yes; then
AC_CHECK_HEADER(lz4.h, [], [AC_MSG_ERROR([lz4.h header file is required for
LZ4])])
fi
@@ -2370,11 +2306,8 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e
's/-lreadline//g'`
AC_CHECK_FUNCS(m4_normalize([
backtrace_symbols
-<<<<<<< HEAD
cbrt
clock_gettime
-=======
->>>>>>> REL_16_9
copyfile
getifaddrs
getpeerucred
@@ -2437,10 +2370,7 @@ AC_CHECK_DECLS([strlcat, strlcpy, strnlen])
# won't handle deployment target restrictions on macOS
AC_CHECK_DECLS([preadv], [], [AC_LIBOBJ(preadv)], [#include <sys/uio.h>])
AC_CHECK_DECLS([pwritev], [], [AC_LIBOBJ(pwritev)], [#include <sys/uio.h>])
-<<<<<<< HEAD
-=======
AC_CHECK_DECLS([strchrnul], [], [], [#include <string.h>])
->>>>>>> REL_16_9
# This is probably only present on macOS, but may as well check always
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
@@ -2451,13 +2381,10 @@ AC_REPLACE_FUNCS(m4_normalize([
getpeereid
inet_aton
mkdtemp
-<<<<<<< HEAD
pread
pwrite
random
srandom
-=======
->>>>>>> REL_16_9
strlcat
strlcpy
strnlen
@@ -2545,7 +2472,6 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then
AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable
'int optreset'.])
fi
-<<<<<<< HEAD
AC_CHECK_FUNCS([strtoll __strtoll strtoq], [break])
AC_CHECK_FUNCS([strtoull __strtoull strtouq], [break])
# strto[u]ll may exist but not be declared
@@ -2562,8 +2488,6 @@ if test x"$pgac_cv_gcc_int_atomics" = x"yes"; then
AC_DEFINE(HAVE_GCC_INT_ATOMICS, 1, [Define to 1 if you have
__sync_lock_test_and_set(int *) and friends.])
fi
-=======
->>>>>>> REL_16_9
if test "$with_icu" = yes; then
ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$ICU_CFLAGS $CPPFLAGS"
@@ -2990,10 +2914,7 @@ if test "$enable_tap_tests" = yes; then
# AX_PROG_PERL_MODULES here, but prove might be part of a different Perl
# installation than perl, eg on MSys, so we have to check using prove.
AC_MSG_CHECKING(for Perl modules required for TAP tests)
-<<<<<<< HEAD
-=======
__CONFIG_HOST_OS__=$host_os; export __CONFIG_HOST_OS__
->>>>>>> REL_16_9
[modulestderr=`"$PROVE" "$srcdir/config/check_modules.pl" 2>&1 >/dev/null`]
if test $? -eq 0; then
# log the module version details, but don't show them interactively
@@ -3026,7 +2947,6 @@ else
PGAC_PROG_CC_LDFLAGS_OPT([-Wl,--as-needed], $link_test_func)
fi
-<<<<<<< HEAD
# Many of the autoconf tests produce warnings, or even compiler errors, on
# purpose as they run through the conftest programs. So, treating warning as
# error should be last step after all autoconf checks are performed, otherwise
@@ -3072,13 +2992,12 @@ AC_DEFINE_UNQUOTED(GP_VERSION,
[GP_MAJORVERSION=`expr "$GP_VERSION" : '\([0-9][0-9]*\)'`]
AC_SUBST(GP_MAJORVERSION)
AC_DEFINE_UNQUOTED(GP_MAJORVERSION, "$GP_MAJORVERSION", [Cloudberry major
version as a string])
-=======
+
# For linkers that understand --export-dynamic, add that to the LDFLAGS_EX_BE
# (backend specific ldflags). One some platforms this will always fail (e.g.,
# windows), but on others it depends on the choice of linker (e.g., solaris).
PGAC_PROG_CC_LD_VARFLAGS_OPT(LDFLAGS_EX_BE, [-Wl,--export-dynamic],
$link_test_func)
AC_SUBST(LDFLAGS_EX_BE)
->>>>>>> REL_16_9
# Create compiler version string
if test x"$GCC" = x"yes" ; then
@@ -3192,16 +3111,13 @@
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
[echo >src/interfaces/ecpg/include/stamp-h])
AC_OUTPUT
-<<<<<<< HEAD
# The configure args contain '-Wl,-rpath,\$$ORIGIN`, when it falls
# as a C literal string, it's invalid, so converting `\` to `\\`
# to be correct for C program.
sed -i '/define CONFIGURE_ARGS/s,\([[^\\]]\)\\\$\$,\1\\\\$$,g'
src/include/pg_config.h
-=======
# Ensure that any meson build directories would reconfigure and see that
# there's a conflicting in-tree build and can error out.
if test "$vpath_build" = "no"; then
touch meson.build
fi
->>>>>>> REL_16_9
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org
For additional commands, e-mail: commits-h...@cloudberry.apache.org
