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
commit edbb869162ae55874cf0c26dbfccbdcd58ad70b3 Author: Hao Wu <[email protected]> AuthorDate: Wed Jul 16 10:02:24 2025 +0000 Fix conflicts in config and file aclocal.m4 --- aclocal.m4 | 4 ---- config/c-library.m4 | 27 --------------------------- config/check_modules.pl | 10 ---------- config/programs.m4 | 9 --------- config/python.m4 | 5 ----- 5 files changed, 55 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 46526d9b0e7..057a54bc9b6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,4 @@ dnl aclocal.m4 -<<<<<<< HEAD -m4_include([config/ac_func_accept_argtypes.m4]) -======= ->>>>>>> REL_16_9 m4_include([config/ax_pthread.m4]) m4_include([config/c-compiler.m4]) m4_include([config/cxx-compiler.m4]) diff --git a/config/c-library.m4 b/config/c-library.m4 index 11e67fe2da4..c1dd8046798 100644 --- a/config/c-library.m4 +++ b/config/c-library.m4 @@ -37,33 +37,6 @@ AC_DEFUN([PGAC_STRUCT_TIMEZONE], ])# PGAC_STRUCT_TIMEZONE -<<<<<<< HEAD -# PGAC_FUNC_GETTIMEOFDAY_1ARG -# --------------------------- -# Check if gettimeofday() has only one arguments. (Normal is two.) -# If so, define GETTIMEOFDAY_1ARG. -AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG], -[AC_CACHE_CHECK(whether gettimeofday takes only one argument, -pgac_cv_func_gettimeofday_1arg, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/time.h>], -[struct timeval *tp = 0; -struct timezone *tzp = 0; -gettimeofday(tp,tzp);])], -[pgac_cv_func_gettimeofday_1arg=no], -[pgac_cv_func_gettimeofday_1arg=yes])]) -if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then - AC_DEFINE(GETTIMEOFDAY_1ARG, 1, - [Define to 1 if gettimeofday() takes only 1 argument.]) -fi -AH_VERBATIM(GETTIMEOFDAY_1ARG_, -[@%:@ifdef GETTIMEOFDAY_1ARG -@%:@ define gettimeofday(a,b) gettimeofday(a) -@%:@endif])dnl -])# PGAC_FUNC_GETTIMEOFDAY_1ARG - - -======= ->>>>>>> REL_16_9 # PGAC_FUNC_STRERROR_R_INT # --------------------------- # Check if strerror_r() returns int (POSIX) rather than char * (GNU libc). diff --git a/config/check_modules.pl b/config/check_modules.pl index 1b42500c19e..611f3a673fd 100644 --- a/config/check_modules.pl +++ b/config/check_modules.pl @@ -6,20 +6,13 @@ # use strict; use warnings; -<<<<<<< HEAD -======= use Config; ->>>>>>> REL_16_9 use IPC::Run 0.79; # Test::More and Time::HiRes are supposed to be part of core Perl, # but some distros omit them in a minimal installation. -<<<<<<< HEAD -use Test::More 0.87; -======= use Test::More 0.98; ->>>>>>> REL_16_9 use Time::HiRes 1.52; # While here, we might as well report exactly what versions we found. @@ -27,11 +20,8 @@ diag("IPC::Run::VERSION: $IPC::Run::VERSION"); diag("Test::More::VERSION: $Test::More::VERSION"); diag("Time::HiRes::VERSION: $Time::HiRes::VERSION"); -<<<<<<< HEAD -======= # Check that if prove is using msys perl it is for an msys target ok( ($ENV{__CONFIG_HOST_OS__} || "") eq 'msys', "Msys perl used for correct target") if $Config{osname} eq 'msys'; ->>>>>>> REL_16_9 ok(1); done_testing(); diff --git a/config/programs.m4 b/config/programs.m4 index 7383fa370d4..a06d6a133aa 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -90,23 +90,14 @@ else echo '%%' > conftest.l if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then pgac_flex_version=`$pgac_candidate --version 2>/dev/null` -<<<<<<< HEAD - if echo "$pgac_flex_version" | sed ['s/[^0-9]/ /g'] | $AWK '{ if ([$]1 == 2 && ([$]2 > 5 || ([$]2 == 5 && [$]3 >= 4))) exit 0; else exit 1;}' -======= if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 == 2 && ([$]2 > 5 || ([$]2 == 5 && [$]3 >= 35))) exit 0; else exit 1;}' ->>>>>>> REL_16_9 then pgac_cv_path_flex=$pgac_candidate break 2 else AC_MSG_WARN([ -<<<<<<< HEAD *** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry. -*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version.]) -======= -*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. *** Flex version 2.5.35 or later is required, but this is $pgac_flex_version.]) ->>>>>>> REL_16_9 fi fi fi diff --git a/config/python.m4 b/config/python.m4 index 9b045d81e0b..b295ad3d3a4 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -40,13 +40,8 @@ python_majorversion=`echo "$python_fullversion" | sed '[s/^\([0-9]*\).*/\1/]'` python_minorversion=`echo "$python_fullversion" | sed '[s/^[0-9]*\.\([0-9]*\).*/\1/]'` python_version=`echo "$python_fullversion" | sed '[s/^\([0-9]*\.[0-9]*\).*/\1/]'` # Reject unsupported Python versions as soon as practical. -<<<<<<< HEAD -if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 7; then - AC_MSG_ERROR([Python version $python_version is too old (version 2.7 or later is required)]) -======= if test "$python_majorversion" -lt 3; then AC_MSG_ERROR([Python version $python_version is too old (version 3 or later is required)]) ->>>>>>> REL_16_9 fi AC_MSG_CHECKING([for Python sysconfig module]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
