michael@300: Index: src/Makefile.shlib michael@300: --- src/Makefile.shlib.orig 2010-07-06 05:55:33.000000000 +0200 michael@300: +++ src/Makefile.shlib 2010-09-21 08:58:56.000000000 +0200 michael@699: @@ -305,7 +305,7 @@ michael@300: michael@300: .PHONY: all-lib all-static-lib all-shared-lib michael@300: michael@300: -all-lib: all-shared-lib michael@300: +all-lib: michael@300: ifdef soname michael@300: # no static library when building a dynamically loadable module michael@300: all-lib: all-static-lib michael@300: Index: src/backend/Makefile michael@300: --- src/backend/Makefile.orig 2010-07-05 20:54:37.000000000 +0200 michael@300: +++ src/backend/Makefile 2010-09-21 08:58:56.000000000 +0200 michael@300: @@ -41,7 +41,7 @@ michael@300: LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE) michael@300: michael@300: # The backend doesn't need everything that's in LIBS, however michael@300: -LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) michael@300: +LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) michael@300: michael@300: ########################################################################## michael@300: michael@300: Index: src/include/port.h michael@300: --- src/include/port.h.orig 2010-05-15 16:44:13.000000000 +0200 michael@300: +++ src/include/port.h 2010-09-21 08:58:56.000000000 +0200 michael@699: @@ -393,7 +393,7 @@ michael@699: extern int getpeereid(int sock, uid_t *uid, gid_t *gid); michael@300: #endif michael@300: michael@300: -#ifndef HAVE_ISINF michael@300: +#if !defined(HAVE_ISINF) && !defined(__FreeBSD__) michael@300: extern int isinf(double x); michael@300: #endif michael@300: michael@300: Index: src/makefiles/Makefile.freebsd michael@300: --- src/makefiles/Makefile.freebsd.orig 2010-07-05 20:54:38.000000000 +0200 michael@300: +++ src/makefiles/Makefile.freebsd 2010-09-21 09:00:42.000000000 +0200 michael@300: @@ -17,7 +17,7 @@ michael@300: # Rule for building a shared library from a single .o file michael@300: %.so: %.o michael@300: ifdef ELF_SYSTEM michael@300: - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< michael@300: + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) michael@300: else michael@300: $(LD) $(LDREL) $(LDOUT) $<.obj -x $< michael@300: @echo building shared object $@ michael@300: Index: src/makefiles/Makefile.linux michael@300: --- src/makefiles/Makefile.linux.orig 2010-07-05 20:54:38.000000000 +0200 michael@300: +++ src/makefiles/Makefile.linux 2010-09-21 09:01:01.000000000 +0200 michael@300: @@ -14,4 +14,4 @@ michael@300: michael@300: # Rule for building a shared library from a single .o file michael@300: %.so: %.o michael@300: - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< michael@300: + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) michael@300: Index: src/makefiles/Makefile.solaris michael@300: --- src/makefiles/Makefile.solaris.orig 2010-07-05 20:54:38.000000000 +0200 michael@300: +++ src/makefiles/Makefile.solaris 2010-09-21 09:01:22.000000000 +0200 michael@300: @@ -19,9 +19,9 @@ michael@300: # Rule for building a shared library from a single .o file michael@300: %.so: %.o michael@300: ifeq ($(GCC), yes) michael@300: - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< michael@300: + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) michael@300: else michael@300: - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< michael@300: + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< $(SHLIB_LINK) michael@300: endif michael@300: michael@300: sqlmansect = 5sql