Switch dependency order of libpgcommon and libpgport

Continuing 63f32f3416a8b4f8e057dc184e8e8eae734ccc8a, libpgcommon should
depend on libpgport, but not vice versa.  But wait_result_to_str() in
wait_error.c depends on pstrdup() in libpgcommon.  So move exec.c and
wait_error.c from libpgport to libpgcommon.  Also switch the link order
in the place that's actually used by the failing ecpg builds.

The function declarations have been left in port.h for now.  That should
perhaps be separated sometime.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index b04d382674267abc497518015bd641b7a8935d4c..4c8454cad786336345ae9f29377db6f6dbe01156 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -510,7 +510,7 @@ endif
 
 LIBOBJS = @LIBOBJS@
 
-LIBS := -lpgport -lpgcommon $(LIBS)
+LIBS := -lpgcommon -lpgport $(LIBS)
 
 # to make ws2_32.lib the last library, and always link with shfolder,
 # so SHGetFolderName isn't picked up from shell32.dll

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index c0e85fcda88acdf1ba82a35a1aa15444bb8a76ea..f10b6177f20f81f8fbdc5d6fc087de6230ad4764 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
 AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN
-GETTEXT_FILES    = findtimezone.c initdb.c ../../common/fe_memutils.c ../../port/dirmod.c ../../port/exec.c ../../port/wait_error.c
+GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/dirmod.c
 GETTEXT_TRIGGERS = simple_prompt

diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index 2888c4620459c707715a3e24e73b5fe458d80fe1..387bbf2c2836d9b283ecc5e3f4fec7c935463b3c 100644 (file)
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,4 +1,4 @@
 # src/bin/pg_config/nls.mk
 CATALOG_NAME     = pg_config
 AVAIL_LANGUAGES  = cs de es fr it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
-GETTEXT_FILES    = pg_config.c ../../port/exec.c
+GETTEXT_FILES    = pg_config.c ../../common/exec.c

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 51a21a6c470fb1a0df0f5f080bc39b795668255a..187df408835cd296aae152ca0644687687e4e863 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,4 +1,4 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME     = pg_ctl
 AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru sv zh_CN zh_TW
-GETTEXT_FILES    = pg_ctl.c ../../common/fe_memutils.c ../../port/exec.c ../../port/wait_error.c
+GETTEXT_FILES    = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c

diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 278a0fb5e65f758fe8ab6a7d272beaee22215dc8..bf40e28eaf4cee5cabaf896e04cfae0f7a32f211 100644 (file)
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -7,7 +7,7 @@ GETTEXT_FILES    = pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
                    pg_dump.c common.c pg_dump_sort.c \
                    pg_restore.c pg_dumpall.c \
                    parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
-                   ../../common/fe_memutils.c ../../port/exec.c
+                   ../../common/exec.c ../../common/fe_memutils.c
 GETTEXT_TRIGGERS = write_msg:2 exit_horribly:2 simple_prompt \
                    ExecuteSqlCommand:3 ahlog:3 warn_or_exit_horribly:3
 GETTEXT_FLAGS  = \

diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index b7c739fb9c8728086e1ea87d5214f7b657542f65..e2505f17740ddc56aadfc9b138a1b2474c536ef6 100644 (file)
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -4,6 +4,6 @@ AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN zh_TW
 GETTEXT_FILES    = command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c psqlscan.c startup.c describe.c sql_help.h sql_help.c \
                    tab-complete.c variables.c \
-                   ../../common/fe_memutils.c ../../port/exec.c ../../port/wait_error.c
+                   ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c
 GETTEXT_TRIGGERS = N_ psql_error simple_prompt
 GETTEXT_FLAGS    = psql_error:1:c-format

diff --git a/src/common/Makefile b/src/common/Makefile
index cd97980ce663147087c133d6ff16ab75b8a0443e..c5b98ab27bba78c65b279c6311d9bbc718f39163 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS_COMMON = relpath.o
+OBJS_COMMON = exec.o relpath.o wait_error.o
 
 OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o
 

diff --git a/src/port/exec.c b/src/common/exec.c
similarity index 99%
rename from src/port/exec.c
rename to src/common/exec.c
index 01203c056cc068a30628908537456b08a7041c25..527b3af8dad9d48f63cf4e32ea2191a026752b08 100644 (file)
--- a/src/port/exec.c
+++ b/src/common/exec.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       src/port/exec.c
+ *       src/common/exec.c
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/port/wait_error.c b/src/common/wait_error.c
similarity index 98%
rename from src/port/wait_error.c
rename to src/common/wait_error.c
index b75710f86a00ba174764fd42d6583ead8a6b2f21..db0ebdaf18331672dca65269f8fc02151d4949dc 100644 (file)
--- a/src/port/wait_error.c
+++ b/src/common/wait_error.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       src/port/wait_error.c
+ *       src/common/wait_error.c
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/port/Makefile b/src/port/Makefile
index a032acca1c26be025aef180e9f52911790dc2fbc..1be4ff57a2f5fc46dba49c247dbd68532388cfe2 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -30,11 +30,10 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o exec.o fls.o inet_net_ntop.o \
+OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o fls.o inet_net_ntop.o \
        noblock.o path.o pgcheckdir.o pg_crc.o pgmkdirp.o pgsleep.o \
        pgstrcasecmp.o pqsignal.o \
-       qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o \
-       wait_error.o
+       qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o
 
 # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
 OBJS_SRV = $(OBJS:%.o=%_srv.o)

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 264c5307fb64358c2de25c3657bb281794b62697..54314a281f07cc0b2a524581ad224320ada58aed 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -67,14 +67,14 @@ sub mkvcbuild
        our @pgportfiles = qw(
          asprintf.c chklocale.c crypt.c fls.c fseeko.c getrusage.c inet_aton.c random.c
          srandom.c getaddrinfo.c gettimeofday.c inet_net_ntop.c kill.c open.c
-         erand48.c snprintf.c strlcat.c strlcpy.c dirmod.c exec.c noblock.c path.c
+         erand48.c snprintf.c strlcat.c strlcpy.c dirmod.c noblock.c path.c
          pgcheckdir.c pg_crc.c pgmkdirp.c pgsleep.c pgstrcasecmp.c pqsignal.c
          qsort.c qsort_arg.c quotes.c
-         sprompt.c tar.c thread.c wait_error.c getopt.c getopt_long.c dirent.c rint.c win32env.c
+         sprompt.c tar.c thread.c getopt.c getopt_long.c dirent.c rint.c win32env.c
          win32error.c win32setlocale.c);
 
        our @pgcommonallfiles = qw(
-         relpath.c);
+         exec.c relpath.c wait_error.c);
 
        our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));