From f39418e9b36987ce1dac0c55da1452e43ec46e15 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut
Date: Thu, 17 Oct 2013 21:52:54 -0400
Subject: 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.
---
 src/bin/initdb/nls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bin/initdb')

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index c0e85fcda8..f10b6177f2 100644
--- 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
-- 
cgit v1.2.3