On Tue, Dec 4, 2012 at 04:45:16PM +0100, Michael Meskes wrote: > On Mon, Dec 03, 2012 at 01:12:48PM +0800, Jiang Guiqing wrote: > > isinf() is not build to libecpg.so if build and install postgresql > > by source on solaris9. > > (isinf() is not contained within solaris9 system.) > > ... > > I modify src/interfaces/ecpg/ecpglib/Makefile to resolve this problem. > > The diff file refer to the attachment "ecpglib-Makefile.patch". > > Thanks for finding and fixing the problem, patch committed to HEAD and all > 9.* branches.
I have applied the attached patch to 9.0 to fix a merge conflict. I patterned it after the commits you did to the other branches. -- Bruce Momjian <br...@momjian.us> http://momjian.us EnterpriseDB http://enterprisedb.com + It's impossible for everything to be true. +
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile new file mode 100644 index ced2fc4..3adf36d *** a/src/interfaces/ecpg/ecpglib/Makefile --- b/src/interfaces/ecpg/ecpglib/Makefile *************** include $(top_srcdir)/src/Makefile.shlib *** 58,68 **** # necessarily use the same object files as the backend uses. Instead, # symlink the source files in here and build our own object file. ! <<<<<<< HEAD ! path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/% ! ======= ! path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/% ! >>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system. rm -f $@ && $(LN_S) $< . misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h --- 58,64 ---- # 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 pgstrcasecmp.c snprintf.c strlcpy.c thread.c isinf.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
