You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by dj...@apache.org on 2026/04/03 09:44:31 UTC
(cloudberry) branch main updated (a6a7579ba57 -> 88ea4bd1b65)
This is an automated email from the ASF dual-hosted git repository.
djwang pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
from a6a7579ba57 Fix sed -i compatibility in configure.ac
new d07a5923d03 Disable mdblocales by default in configure
new 88ea4bd1b65 Regenerate configure for gp_stats_clolector
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
configure | 283 +++++++++++++++++++++++++++++++++++++++++++----------------
configure.ac | 2 +-
2 files changed, 206 insertions(+), 79 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org
(cloudberry) 01/02: Disable mdblocales by default in configure
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit d07a5923d03e4a2ec5b63df2ed558ea8db114605
Author: Dianjin Wang <wa...@gmail.com>
AuthorDate: Tue Mar 31 17:56:30 2026 +0800
Disable mdblocales by default in configure
Changed the default value of `--with-mdblocales` from 'yes' to 'no' in
configure.ac. This prevents enabling custom locales by default, which
require additional packages and may cause compatibility issues across
different system environments (e.g., Rocky Linux 8 vs 9 with different
libc versions). Users who need mdblocales can explicitly enable it with
`--with-mdblocales` option.
Regenerated configure file using autoconf 2.69 on Rocky Linux 8.
---
configure | 103 ++++++++++++++++++++++++++++++-----------------------------
configure.ac | 2 +-
2 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/configure b/configure
index 13295a946ca..52ff4e5ede2 100755
--- a/configure
+++ b/configure
@@ -1697,7 +1697,7 @@ Optional Packages:
--without-libcurl do not use libcurl
--with-apr-config=PATH path to apr-1-config utility
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --without-mdblocales build without MDB locales
+ --with-mdblocales build with MDB locales
--with-ssl=LIB use LIB for SSL/TLS support (openssl)
--with-openssl obsolete spelling of --with-ssl=openssl
@@ -2914,6 +2914,7 @@ PG_PACKAGE_VERSION=14.4
+
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
if test -f "$ac_dir/install-sh"; then
@@ -12906,56 +12907,6 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
-fi
-
-if test "$with_mdblocales" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
-$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
-if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmdblocales $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mdb_setlocale ();
-int
-main ()
-{
-return mdb_setlocale ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_mdblocales_mdb_setlocale=yes
-else
- ac_cv_lib_mdblocales_mdb_setlocale=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
-$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
-if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMDBLOCALES 1
-_ACEOF
-
- LIBS="-lmdblocales $LIBS"
-
-else
- as_fn_error $? "mdblocales library not found" "$LINENO" 5
-fi
-
fi
if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
@@ -14880,6 +14831,56 @@ fi
fi
+if test "$with_mdblocales" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_setlocale in -lmdblocales" >&5
+$as_echo_n "checking for mdb_setlocale in -lmdblocales... " >&6; }
+if ${ac_cv_lib_mdblocales_mdb_setlocale+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmdblocales $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mdb_setlocale ();
+int
+main ()
+{
+return mdb_setlocale ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mdblocales_mdb_setlocale=yes
+else
+ ac_cv_lib_mdblocales_mdb_setlocale=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mdblocales_mdb_setlocale" >&5
+$as_echo "$ac_cv_lib_mdblocales_mdb_setlocale" >&6; }
+if test "x$ac_cv_lib_mdblocales_mdb_setlocale" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMDBLOCALES 1
+_ACEOF
+
+ LIBS="-lmdblocales $LIBS"
+
+else
+ as_fn_error $? "mdblocales library not found" "$LINENO" 5
+fi
+
+fi
+
if test "$enable_external_fts" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson_version_str in -ljansson" >&5
$as_echo_n "checking for jansson_version_str in -ljansson... " >&6; }
diff --git a/configure.ac b/configure.ac
index ef31ccbd86c..1db73a39a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1484,7 +1484,7 @@ AC_SUBST(install_bin)
# MDB locales
#
-PGAC_ARG_BOOL(with, mdblocales, yes, [build without MDB locales],
+PGAC_ARG_BOOL(with, mdblocales, no, [build with MDB locales],
[AC_DEFINE([USE_MDBLOCALES], 1, [Define to 1 to build with MDB locales. (--with-mdblocales)])])
AC_SUBST(USE_MDBLOCALES)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org
(cloudberry) 02/02: Regenerate configure for gp_stats_clolector
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 88ea4bd1b657a232c2fe928b8452d668487a3220
Author: Dianjin Wang <wa...@gmail.com>
AuthorDate: Tue Mar 31 17:56:30 2026 +0800
Regenerate configure for gp_stats_clolector
Regenerated configure file using autoconf 2.69 on Rocky Linux 8.
---
configure | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 153 insertions(+), 27 deletions(-)
diff --git a/configure b/configure
index 52ff4e5ede2..b3844c6e309 100755
--- a/configure
+++ b/configure
@@ -721,8 +721,9 @@ GREP
with_apr_config
with_libcurl
with_rt
-with_zstd
+PROTOC
with_gp_stats_collector
+with_zstd
with_libbz2
LZ4_LIBS
LZ4_CFLAGS
@@ -1693,6 +1694,8 @@ Optional Packages:
--with-lz4 build with LZ4 support
--without-libbz2 do not use bzip2
--without-zstd do not build with Zstandard
+ --with-gp_stats_collector
+ build with stats collector extension
--without-rt do not use Realtime Library
--without-libcurl do not use libcurl
--with-apr-config=PATH path to apr-1-config utility
@@ -11059,6 +11062,155 @@ fi
$as_echo "$with_zstd" >&6; }
+#
+# gp_stats_collector
+#
+
+
+
+# Check whether --with-gp_stats_collector was given.
+if test "${with_gp_stats_collector+set}" = set; then :
+ withval=$with_gp_stats_collector;
+ case $withval in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ as_fn_error $? "no argument expected for --with-gp_stats_collector option" "$LINENO" 5
+ ;;
+ esac
+
+else
+ with_gp_stats_collector=no
+
+fi
+
+
+
+
+if test "$with_gp_stats_collector" = yes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf >= 3.0.0" >&5
+$as_echo_n "checking for protobuf >= 3.0.0... " >&6; }
+
+if test -n "$PROTOBUF_CFLAGS"; then
+ pkg_cv_PROTOBUF_CFLAGS="$PROTOBUF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "protobuf >= 3.0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PROTOBUF_CFLAGS=`$PKG_CONFIG --cflags "protobuf >= 3.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PROTOBUF_LIBS"; then
+ pkg_cv_PROTOBUF_LIBS="$PROTOBUF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "protobuf >= 3.0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PROTOBUF_LIBS=`$PKG_CONFIG --libs "protobuf >= 3.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "protobuf >= 3.0.0" 2>&1`
+ else
+ PROTOBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "protobuf >= 3.0.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PROTOBUF_PKG_ERRORS" >&5
+
+ as_fn_error $? "protobuf >= 3.0.0 is required for gp_stats_collector" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "protobuf >= 3.0.0 is required for gp_stats_collector" "$LINENO" 5
+
+else
+ PROTOBUF_CFLAGS=$pkg_cv_PROTOBUF_CFLAGS
+ PROTOBUF_LIBS=$pkg_cv_PROTOBUF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+ # Extract the first word of "protoc", so it can be a program name with args.
+set dummy protoc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PROTOC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PROTOC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PROTOC="$PROTOC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PROTOC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PROTOC" && ac_cv_path_PROTOC="no"
+ ;;
+esac
+fi
+PROTOC=$ac_cv_path_PROTOC
+if test -n "$PROTOC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOC" >&5
+$as_echo "$PROTOC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "$PROTOC" = no; then
+ as_fn_error $? "protoc is required for gp_stats_collector but was not found in PATH" "$LINENO" 5
+ fi
+fi
+
if test "$with_zstd" = yes; then
pkg_failed=no
@@ -11153,32 +11305,6 @@ $as_echo "yes" >&6; }
fi
fi
-#
-# gp_stats_collector
-#
-
-
-
-# Check whether --with-gp-stats-collector was given.
-if test "${with_gp_stats_collector+set}" = set; then :
- withval=$with_gp_stats_collector;
- case $withval in
- yes)
- :
- ;;
- no)
- :
- ;;
- *)
- as_fn_error $? "no argument expected for --with-gp-stats-collector option" "$LINENO" 5
- ;;
- esac
-
-else
- with_gp_stats_collector=no
-
-fi
-
#
# Realtime library
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org