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 889cd18d6e2 Remove gcc option -Wshadow=compatible-local
889cd18d6e2 is described below
commit 889cd18d6e2207f60dcc8527cd7d8ff8a5556764
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Oct 13 10:46:06 2025 +0800
Remove gcc option -Wshadow=compatible-local
---
GNUmakefile.in | 4 +--
configure | 69 -------------------------------------
configure.ac | 4 +--
contrib/Makefile | 4 ---
contrib/citext/Makefile | 6 +---
contrib/file_fdw/Makefile | 5 ---
contrib/hstore_plpython/Makefile | 4 ---
contrib/pageinspect/Makefile | 4 ---
contrib/pg_buffercache/Makefile | 7 ----
contrib/pg_stat_statements/Makefile | 4 ---
contrib/pgcrypto/Makefile | 17 +--------
meson.build | 2 +-
12 files changed, 7 insertions(+), 123 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index e5a54a0309d..2a292a82b95 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,7 +20,7 @@ all:
# $(MAKE) -C contrib/extprotocol all
# $(MAKE) -C contrib/dblink all
# $(MAKE) -C contrib/indexscan all
-# $(MAKE) -C contrib/interconnect all
+ $(MAKE) -C contrib/interconnect all
# $(MAKE) -C contrib/pageinspect all # needed by src/test/isolation
# $(MAKE) -C contrib/hstore all
# $(MAKE) -C contrib/pgcrypto all
@@ -67,7 +67,7 @@ install:
# $(MAKE) -C contrib/extprotocol $@
# $(MAKE) -C contrib/dblink $@
# $(MAKE) -C contrib/indexscan $@
-# $(MAKE) -C contrib/interconnect $@
+ $(MAKE) -C contrib/interconnect $@
# $(MAKE) -C contrib/pageinspect $@ # needed by src/test/isolation
# $(MAKE) -C contrib/hstore $@
# $(MAKE) -C contrib/pgcrypto $@
diff --git a/configure b/configure
index 255868d34d1..cb4317e3c67 100755
--- a/configure
+++ b/configure
@@ -6104,64 +6104,6 @@ if test
x"$pgac_cv_prog_CXX_cxxflags__Wcast_function_type" = x"yes"; then
CXXFLAGS="${CXXFLAGS} -Wcast-function-type"
fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports
-Wshadow=compatible-local, for CFLAGS" >&5
-$as_echo_n "checking whether ${CC} supports -Wshadow=compatible-local, for
CFLAGS... " >&6; }
-if ${pgac_cv_prog_CC_cflags__Wshadow_compatible_local+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- pgac_save_CFLAGS=$CFLAGS
-pgac_save_CC=$CC
-CC=${CC}
-CFLAGS="${CFLAGS} -Wshadow=compatible-local"
-ac_save_c_werror_flag=$ac_c_werror_flag
-ac_c_werror_flag=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- pgac_cv_prog_CC_cflags__Wshadow_compatible_local=yes
-else
- pgac_cv_prog_CC_cflags__Wshadow_compatible_local=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_c_werror_flag=$ac_save_c_werror_flag
-CFLAGS="$pgac_save_CFLAGS"
-CC="$pgac_save_CC"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$pgac_cv_prog_CC_cflags__Wshadow_compatible_local" >&5
-$as_echo "$pgac_cv_prog_CC_cflags__Wshadow_compatible_local" >&6; }
-if test x"$pgac_cv_prog_CC_cflags__Wshadow_compatible_local" = x"yes"; then
- CFLAGS="${CFLAGS} -Wshadow=compatible-local"
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports
-Wshadow=compatible-local, for CXXFLAGS" >&5
-$as_echo_n "checking whether ${CXX} supports -Wshadow=compatible-local, for
CXXFLAGS... " >&6; }
-if ${pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- pgac_save_CXXFLAGS=$CXXFLAGS
-pgac_save_CXX=$CXX
-CXX=${CXX}
-CXXFLAGS="${CXXFLAGS} -Wshadow=compatible-local"
-ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-ac_cxx_werror_flag=yes
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6185,17 +6127,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext
>&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-CXXFLAGS="$pgac_save_CXXFLAGS"
-CXX="$pgac_save_CXX"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" >&5
-$as_echo "$pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" >&6; }
-if test x"$pgac_cv_prog_CXX_cxxflags__Wshadow_compatible_local" = x"yes"; then
- CXXFLAGS="${CXXFLAGS} -Wshadow=compatible-local"
-fi
-
-
# This was included in -Wall/-Wformat in older GCC versions
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports
-Wformat-security, for CFLAGS" >&5
diff --git a/configure.ac b/configure.ac
index 679bee6053a..b79c8460748 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,8 +581,8 @@ if test "$GCC" = yes -a "$ICC" = no; then
PGAC_PROG_CXX_CFLAGS_OPT([-Wimplicit-fallthrough=3])
PGAC_PROG_CC_CFLAGS_OPT([-Wcast-function-type])
PGAC_PROG_CXX_CFLAGS_OPT([-Wcast-function-type])
- PGAC_PROG_CC_CFLAGS_OPT([-Wshadow=compatible-local])
- PGAC_PROG_CXX_CFLAGS_OPT([-Wshadow=compatible-local])
+ # PGAC_PROG_CC_CFLAGS_OPT([-Wshadow=compatible-local])
+ # PGAC_PROG_CXX_CFLAGS_OPT([-Wshadow=compatible-local])
# This was included in -Wall/-Wformat in older GCC versions
PGAC_PROG_CC_CFLAGS_OPT([-Wformat-security])
PGAC_PROG_CXX_CFLAGS_OPT([-Wformat-security])
diff --git a/contrib/Makefile b/contrib/Makefile
index 0c66074f5fe..b00ddbc1345 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -36,7 +36,6 @@ SUBDIRS = \
old_snapshot \
pageinspect \
passwordcheck \
- postgres_fdw \
pg_buffercache \
pg_freespacemap \
pg_prewarm \
@@ -46,11 +45,8 @@ SUBDIRS = \
pgrowlocks \
pgstattuple \
pg_visibility \
-<<<<<<< HEAD
-=======
pg_walinspect \
postgres_fdw \
->>>>>>> REL_16_9
seg \
spi \
tablefunc \
diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile
index 593f098d489..cb01d3598fc 100644
--- a/contrib/citext/Makefile
+++ b/contrib/citext/Makefile
@@ -11,12 +11,8 @@ DATA = citext--1.4.sql \
citext--1.0--1.1.sql
PGFILEDESC = "citext - case-insensitive character string data type"
-<<<<<<< HEAD
-REGRESS = citext
+REGRESS = citext citext_utf8
REGRESS_OPTS += --init-file=$(top_srcdir)/src/test/regress/init_file
-=======
-REGRESS = create_index_acl citext citext_utf8
->>>>>>> REL_16_9
ifdef USE_PGXS
PG_CONFIG = pg_config
diff --git a/contrib/file_fdw/Makefile b/contrib/file_fdw/Makefile
index b225f52f1ae..ecbdb2cb12d 100644
--- a/contrib/file_fdw/Makefile
+++ b/contrib/file_fdw/Makefile
@@ -8,13 +8,8 @@ PGFILEDESC = "file_fdw - foreign data wrapper for files"
REGRESS = file_fdw gp_file_fdw
-<<<<<<< HEAD
-EXTRA_CLEAN = sql/file_fdw.sql expected/file_fdw.out sql/gp_file_fdw.sql
expected/gp_file_fdw.out
-
REGRESS_OPTS = --init-file=init_file
-=======
->>>>>>> REL_16_9
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile
index d02c31003d8..d148af0bc8a 100644
--- a/contrib/hstore_plpython/Makefile
+++ b/contrib/hstore_plpython/Makefile
@@ -10,11 +10,7 @@ EXTENSION = hstore_plpython3u
DATA = hstore_plpython3u--1.0.sql
REGRESS = hstore_plpython
-<<<<<<< HEAD
-REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
REGRESS_OPTS = --init-file=$(top_srcdir)/src/test/regress/init_file
-=======
->>>>>>> REL_16_9
PG_CPPFLAGS = $(python_includespec)
-DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
index 80b34b0dfa0..2a7657cb6e5 100644
--- a/contrib/pageinspect/Makefile
+++ b/contrib/pageinspect/Makefile
@@ -14,12 +14,8 @@ OBJS = \
rawpage.o
EXTENSION = pageinspect
-<<<<<<< HEAD
-DATA = pageinspect--1.8--1.9.sql \
-=======
DATA = pageinspect--1.11--1.12.sql pageinspect--1.10--1.11.sql \
pageinspect--1.9--1.10.sql pageinspect--1.8--1.9.sql \
->>>>>>> REL_16_9
pageinspect--1.7--1.8.sql pageinspect--1.6--1.7.sql \
pageinspect--1.5.sql pageinspect--1.5--1.6.sql \
pageinspect--1.4--1.5.sql pageinspect--1.3--1.4.sql \
diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile
index 89cfb0b5a23..123b2a8ebb3 100644
--- a/contrib/pg_buffercache/Makefile
+++ b/contrib/pg_buffercache/Makefile
@@ -8,7 +8,6 @@ OBJS = \
EXTENSION = pg_buffercache
DATA = pg_buffercache--1.2.sql pg_buffercache--1.2--1.3.sql \
pg_buffercache--1.1--1.2.sql pg_buffercache--1.0--1.1.sql \
-<<<<<<< HEAD
pg_buffercache--1.3--1.4.sql \
pg_buffercache--1.4--1.4.1.sql
@@ -16,12 +15,6 @@ PGFILEDESC = "pg_buffercache - monitoring of shared buffer
cache in real-time"
REGRESS = pg_buffercache
REGRESS_OPTS += --init-file=$(top_srcdir)/src/test/regress/init_file
-=======
- pg_buffercache--1.3--1.4.sql
-PGFILEDESC = "pg_buffercache - monitoring of shared buffer cache in real-time"
-
-REGRESS = pg_buffercache
->>>>>>> REL_16_9
ifdef USE_PGXS
PG_CONFIG = pg_config
diff --git a/contrib/pg_stat_statements/Makefile
b/contrib/pg_stat_statements/Makefile
index 2f1b9cc8730..31e4fdeeb96 100644
--- a/contrib/pg_stat_statements/Makefile
+++ b/contrib/pg_stat_statements/Makefile
@@ -17,12 +17,8 @@ PGFILEDESC = "pg_stat_statements - execution statistics of
SQL statements"
LDFLAGS_SL += $(filter -lm, $(LIBS))
REGRESS_OPTS = --temp-config
$(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf
-<<<<<<< HEAD
-REGRESS = pg_stat_statements olap_setup olap_group
-=======
REGRESS = select dml cursors utility level_tracking planning \
user_activity wal extended cleanup oldextversions
->>>>>>> REL_16_9
# Disabled because these tests require
"shared_preload_libraries=pg_stat_statements",
# which typical installcheck users do not have (e.g. buildfarm clients).
NO_INSTALLCHECK = 1
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index f389a08855b..3da128bb1a2 100644
--- a/contrib/pgcrypto/Makefile
+++ b/contrib/pgcrypto/Makefile
@@ -1,15 +1,5 @@
# contrib/pgcrypto/Makefile
-<<<<<<< HEAD
-INT_SRCS = internal.c internal-sha2.c blf.c rijndael.c \
- pgp-mpi-internal.c imath.c sm4.c
-INT_TESTS = sha2
-
-OSSL_SRCS = openssl.c pgp-mpi-openssl.c sm4.c openssl_redirect.c
-OSSL_TESTS = sha2 des 3des cast5
-
-=======
->>>>>>> REL_16_9
ZLIB_TST = pgp-compression
ZLIB_OFF_TST = pgp-zlib-DISABLED
@@ -49,15 +39,10 @@ DATA = pgcrypto--1.3.sql pgcrypto--1.2--1.3.sql
pgcrypto--1.1--1.2.sql \
pgcrypto--1.0--1.1.sql
PGFILEDESC = "pgcrypto - cryptographic functions"
-<<<<<<< HEAD
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
--init-file=$(top_builddir)/src/test/regress/init_file
-REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael sm4 \
- $(CF_TESTS) \
-=======
-REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
+REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael sm4\
sha2 des 3des cast5 \
->>>>>>> REL_16_9
crypt-des crypt-md5 crypt-blowfish crypt-xdes \
pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info \
diff --git a/meson.build b/meson.build
index 5422ab64a3d..d7467fafe4f 100644
--- a/meson.build
+++ b/meson.build
@@ -1963,7 +1963,7 @@ common_warning_flags = [
'-Wmissing-format-attribute',
'-Wimplicit-fallthrough=3',
'-Wcast-function-type',
- '-Wshadow=compatible-local',
+ # '-Wshadow=compatible-local',
# This was included in -Wall/-Wformat in older GCC versions
'-Wformat-security',
]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
