On Tue, Dec 22, 2009 at 8:49 PM, Heikki Linnakangas
<heikki.linnakan...@enterprisedb.com> wrote:
> Ah, I see. The changes were not included in the merge commit after all,
> but I had simple forgot to "git add" them. Sorry about that, should be
> there now.

Thanks for doing "git push" again!

But the compilation still fails.
Attached patch addresses this problem.

Regards,

-- 
Fujii Masao
NIPPON TELEGRAPH AND TELEPHONE CORPORATION
NTT Open Source Software Center
*** a/src/backend/Makefile
--- b/src/backend/Makefile
***************
*** 34,41 **** endif
  
  OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a
  
! # We put libpgport into OBJS, so remove it from LIBS; also add libldap and libpq
! LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE) $(libpq)
  
  # The backend doesn't need everything that's in LIBS, however
  LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
--- 34,41 ----
  
  OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a
  
! # We put libpgport into OBJS, so remove it from LIBS; also add libldap
! LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE)
  
  # The backend doesn't need everything that's in LIBS, however
  LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
*** a/src/backend/postmaster/walreceiverproc/Makefile
--- b/src/backend/postmaster/walreceiverproc/Makefile
***************
*** 18,24 **** OBJS = walreceiverproc.o
  SHLIB_LINK = $(libpq)
  NAME = walreceiverproc
  
! all: all-shared-lib
  
  include $(top_srcdir)/src/Makefile.shlib
  
--- 18,24 ----
  SHLIB_LINK = $(libpq)
  NAME = walreceiverproc
  
! all: submake-libpq all-shared-lib
  
  include $(top_srcdir)/src/Makefile.shlib
  
-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to