From 6ec28d8503ca4d13a7c23ae569ffbce1e39bb2e2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 16 Jul 2005 20:39:24 +0000 Subject: [PATCH] ecpglib depends on last_path_separator from src/port/path.c, so we'd better include that in the library build. This was fixed in 8.0 and later, backport to 7.4 to fix buildfarm failure. --- src/interfaces/ecpg/ecpglib/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 74cdaee6611..40c022137dd 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10.2.2 2004/02/10 07:26:48 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10.2.3 2005/07/16 20:39:24 tgl Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ SO_MINOR_VERSION= 1 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ - connect.o misc.o + connect.o misc.o path.o SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \ $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(THREAD_LIBS) @@ -29,6 +29,14 @@ all: all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib +# We use some port modules verbatim, but since we need to +# compile with appropriate options to build a shared lib, we can't +# necessarily use the same object files as the backend uses. Instead, +# symlink the source files in here and build our own object file. + +path.c: % : $(top_srcdir)/src/port/% + rm -f $@ && $(LN_S) $< . + install: all installdirs install-lib installdirs: @@ -37,7 +45,7 @@ installdirs: uninstall: uninstall-lib clean distclean maintainer-clean: clean-lib - rm -f $(OBJS) + rm -f $(OBJS) path.c depend dep: $(CC) -MM $(CFLAGS) *.c >depend