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 14c164974a1 Fix conflict for global makefile
14c164974a1 is described below
commit 14c164974a16a82081e541ca30d6e444eb46d039
Author: Jinbao Chen <[email protected]>
AuthorDate: Thu Jul 17 11:01:42 2025 +0800
Fix conflict for global makefile
---
src/Makefile.global.in | 34 ------------------------------
src/backend/Makefile | 56 ++++++--------------------------------------------
src/backend/common.mk | 3 ---
3 files changed, 6 insertions(+), 87 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 0acc59583ab..320d4dd1b3b 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -503,12 +503,6 @@ ifeq ($(enable_tap_tests),yes)
ifndef PGXS
define prove_installcheck
-<<<<<<< HEAD
-rm -rf '$(CURDIR)'/tmp_check
-$(MKDIR_P) '$(CURDIR)'/tmp_check
-cd $(srcdir) && \
- TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \
-=======
echo "# +++ tap install-check in $(subdir) +++" && \
rm -rf '$(CURDIR)'/tmp_check && \
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
@@ -516,20 +510,12 @@ cd $(srcdir) && \
TESTLOGDIR='$(CURDIR)/tmp_check/log' \
TESTDATADIR='$(CURDIR)/tmp_check' \
PATH="$(bindir):$(CURDIR):$$PATH" \
->>>>>>> REL_16_9
PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' \
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if
$(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
endef
else # PGXS case
define prove_installcheck
-<<<<<<< HEAD
-rm -rf '$(CURDIR)'/tmp_check
-$(MKDIR_P) '$(CURDIR)'/tmp_check
-cd $(srcdir) && \
- TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \
- PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \
-=======
echo "# +++ tap install-check in $(subdir) +++" && \
rm -rf '$(CURDIR)'/tmp_check && \
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
@@ -538,19 +524,12 @@ cd $(srcdir) && \
TESTDATADIR='$(CURDIR)/tmp_check' \
PATH="$(bindir):$(CURDIR):$$PATH" \
PGPORT='6$(DEF_PGPORT)' \
->>>>>>> REL_16_9
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if
$(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
endef
endif # PGXS
define prove_check
-<<<<<<< HEAD
-rm -rf '$(CURDIR)'/tmp_check
-$(MKDIR_P) '$(CURDIR)'/tmp_check
-cd $(srcdir) && \
- TESTDIR='$(CURDIR)' $(with_temp_install) PGPORT='6$(DEF_PGPORT)' \
-=======
echo "# +++ tap check in $(subdir) +++" && \
rm -rf '$(CURDIR)'/tmp_check && \
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
@@ -559,7 +538,6 @@ cd $(srcdir) && \
TESTDATADIR='$(CURDIR)/tmp_check' \
$(with_temp_install) \
PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' \
->>>>>>> REL_16_9
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if
$(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
endef
@@ -780,11 +758,8 @@ pg_regress_locale_flags = $(if
$(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/
tmp_check_iso/ log/ output_iso/ tests_using_faultinjector.txt
pg_regress_check = \
-<<<<<<< HEAD
$(faultinjector_prep) \
-=======
echo "\# +++ regress check in $(subdir) +++" && \
->>>>>>> REL_16_9
$(with_temp_install) \
$(top_builddir)/src/test/regress/pg_regress \
--temp-instance=./tmp_check \
@@ -793,22 +768,16 @@ pg_regress_check = \
$(TEMP_CONF) \
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS) $(FAULTINJECTOR_OPTS)
pg_regress_installcheck = \
-<<<<<<< HEAD
$(faultinjector_prep) \
-=======
echo "\# +++ regress install-check in $(subdir) +++" && \
->>>>>>> REL_16_9
$(top_builddir)/src/test/regress/pg_regress \
--inputdir=$(srcdir) \
--bindir='$(bindir)' \
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS) $(FAULTINJECTOR_OPTS)
pg_isolation_regress_check = \
-<<<<<<< HEAD
$(faultinjector_prep) \
-=======
echo "\# +++ isolation check in $(subdir) +++" && \
->>>>>>> REL_16_9
$(with_temp_install) \
$(top_builddir)/src/test/isolation/pg_isolation_regress \
--temp-instance=./tmp_check_iso \
@@ -817,11 +786,8 @@ pg_isolation_regress_check = \
$(TEMP_CONF) \
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS) $(FAULTINJECTOR_OPTS)
pg_isolation_regress_installcheck = \
-<<<<<<< HEAD
$(faultinjector_prep) \
-=======
echo "\# +++ isolation install-check in $(subdir) +++" && \
->>>>>>> REL_16_9
$(top_builddir)/src/test/isolation/pg_isolation_regress \
--inputdir=$(srcdir) --outputdir=output_iso \
--bindir='$(bindir)' \
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 730b2d0ad24..3b07e9b435e 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -64,12 +64,9 @@ LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS))
$(LDAP_LIBS_BE) $(ICU_LIBS)
# The backend doesn't need everything that's in LIBS, however
LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
-<<<<<<< HEAD
# Cloudberry uses threads in the backend
LIBS := $(LIBS) -lpthread
-=======
->>>>>>> REL_16_9
ifeq ($(with_systemd),yes)
LIBS += -lsystemd
@@ -96,13 +93,9 @@ postgres: main/main.o libpostgres.so
$(top_builddir)/src/port/libpgport_srv.a $(
$(top_builddir)/src/common/libpgcommon_srv.a $(LIBS) -o $@
else
-postgres: $(OBJS)
-<<<<<<< HEAD
- $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX)
$(export_dynamic) $(LIBS) -o $@
+postgres: $(OBJS)=
+ $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@
endif
-=======
- $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@
->>>>>>> REL_16_9
endif
endif
@@ -111,11 +104,7 @@ endif
ifeq ($(PORTNAME), cygwin)
postgres: $(OBJS)
-<<<<<<< HEAD
- $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX)
$(export_dynamic) -Wl,--stack,$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@
-=======
- $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS)
-Wl,--stack,$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@
->>>>>>> REL_16_9
+ $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS)
-Wl,--stack,$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@
# libpostgres.a is actually built in the preceding rule, but we need this to
# ensure it's newer than postgres; see notes in src/backend/parser/Makefile
@@ -128,11 +117,7 @@ ifeq ($(PORTNAME), win32)
LIBS += -lsecur32
postgres: $(OBJS) $(WIN32RES)
-<<<<<<< HEAD
- $(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS)
$(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X)
-=======
- $(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS)
-Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X)
->>>>>>> REL_16_9
+ $(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS)
-Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols
-Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X)
# libpostgres.a is actually built in the preceding rule, but we need this to
# ensure it's newer than postgres; see notes in src/backend/parser/Makefile
@@ -144,11 +129,7 @@ endif # win32
ifeq ($(PORTNAME), aix)
postgres: $(POSTGRES_IMP)
-<<<<<<< HEAD
- $(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(LDFLAGS)
$(LDFLAGS_EX) -Wl,-bE:$(top_builddir)/src/backend/$(POSTGRES_IMP) $(LIBS)
-Wl,-brtllib -o $@
-=======
- $(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(LDFLAGS)
-Wl,-bE:$(top_builddir)/src/backend/$(POSTGRES_IMP) $(LIBS) -Wl,-brtllib -o $@
->>>>>>> REL_16_9
+ $(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(LDFLAGS)
-Wl,-bE:$(top_builddir)/src/backend/$(POSTGRES_IMP) $(LIBS) -Wl,-brtllib -o $@
# Linking to a single .o with -r is a lot faster than building a .a or passing
# all objects to MKLDEXPORT.
@@ -166,14 +147,6 @@ endif # aix
$(top_builddir)/src/port/libpgport_srv.a: | submake-libpgport
-<<<<<<< HEAD
-# The postgres.o target is needed by the rule in Makefile.global that
-# creates the exports file when MAKE_EXPORTS = true.
-postgres.o: $(OBJS)
- $(CXX) $(LDREL) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX)
$(LIBS) -o $@
-
-=======
->>>>>>> REL_16_9
# The following targets are specified in make commands that appear in
# the make files in our subdirectories. Note that it's important we
# match the dependencies shown in the subdirectory makefiles!
@@ -291,18 +264,9 @@ endif
install-bin: postgres $(POSTGRES_IMP) installdirs
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-<<<<<<< HEAD
ifeq ($(enable_shared_postgres_backend),yes)
$(INSTALL_PROGRAM) libpostgres.so '$(DESTDIR)$(libdir)/libpostgres.so'
endif
-ifneq ($(PORTNAME), win32)
- @rm -f $(DESTDIR)$(bindir)/postmaster$(X)
- ln -s postgres$(X) $(DESTDIR)$(bindir)/postmaster$(X)
-else
- $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postmaster$(X)'
-endif
-=======
->>>>>>> REL_16_9
ifeq ($(MAKE_EXPORTS), true)
$(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
$(INSTALL_PROGRAM) $(MKLDEXPORT)
'$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
@@ -332,14 +296,10 @@ endif
##########################################################################
uninstall:
-<<<<<<< HEAD
rm -f $(DESTDIR)$(bindir)/postgres$(X) $(DESTDIR)$(bindir)/postmaster
$(DESTDIR)$(bindir)/cdbsyncmaster
ifeq ($(enable_shared_postgres_backend),yes)
rm -f $(DESTDIR)$(bindir)/postgres$(X)
$(DESTDIR)$(libdir)/libpostgres.so $(DESTDIR)$(bindir)/postmaster
$(DESTDIR)$(bindir)/cdbsyncmaster
endif
-=======
- rm -f '$(DESTDIR)$(bindir)/postgres$(X)'
->>>>>>> REL_16_9
ifeq ($(MAKE_EXPORTS), true)
rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
@@ -420,8 +380,4 @@ maintainer-clean: distclean
# are up to date. It saves the time of doing all the submakes.
.PHONY: quick
quick: $(OBJS)
-<<<<<<< HEAD
- $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX)
$(export_dynamic) $(LIBS) -o postgres
-=======
- $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o postgres
->>>>>>> REL_16_9
+ $(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o
postgres
diff --git a/src/backend/common.mk b/src/backend/common.mk
index 3e44335748c..1fcff2c6a45 100644
--- a/src/backend/common.mk
+++ b/src/backend/common.mk
@@ -17,12 +17,9 @@ ifneq ($(subdir), src/backend)
all: $(subsysfilename)
endif
-<<<<<<< HEAD
SUBSYS.o: $(SUBDIROBJS) $(OBJS)
$(LD) $(LDREL) $(LDOUT) $@ $^ $(LDOPTS)
-=======
->>>>>>> REL_16_9
objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS)
# Don't rebuild the list if only the OBJS have changed.
$(if $(filter-out $(OBJS),$?),( $(if $(SUBDIROBJS),cat $(SUBDIROBJS);
)echo $(addprefix $(subdir)/,$(OBJS)) ) >$@,touch $@)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
