| |
1 Index: src/Makefile.shlib |
| |
2 --- src/Makefile.shlib.orig 2010-07-06 05:55:33.000000000 +0200 |
| |
3 +++ src/Makefile.shlib 2010-09-21 08:58:56.000000000 +0200 |
| |
4 @@ -329,7 +329,7 @@ |
| |
5 |
| |
6 .PHONY: all-lib all-static-lib all-shared-lib |
| |
7 |
| |
8 -all-lib: all-shared-lib |
| |
9 +all-lib: |
| |
10 ifdef soname |
| |
11 # no static library when building a dynamically loadable module |
| |
12 all-lib: all-static-lib |
| |
13 Index: src/backend/Makefile |
| |
14 --- src/backend/Makefile.orig 2010-07-05 20:54:37.000000000 +0200 |
| |
15 +++ src/backend/Makefile 2010-09-21 08:58:56.000000000 +0200 |
| |
16 @@ -41,7 +41,7 @@ |
| |
17 LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE) |
| |
18 |
| |
19 # The backend doesn't need everything that's in LIBS, however |
| |
20 -LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) |
| |
21 +LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) |
| |
22 |
| |
23 ########################################################################## |
| |
24 |
| |
25 Index: src/include/port.h |
| |
26 --- src/include/port.h.orig 2010-05-15 16:44:13.000000000 +0200 |
| |
27 +++ src/include/port.h 2010-09-21 08:58:56.000000000 +0200 |
| |
28 @@ -374,7 +374,7 @@ |
| |
29 extern int getopt(int nargc, char *const * nargv, const char *ostr); |
| |
30 #endif |
| |
31 |
| |
32 -#ifndef HAVE_ISINF |
| |
33 +#if !defined(HAVE_ISINF) && !defined(__FreeBSD__) |
| |
34 extern int isinf(double x); |
| |
35 #endif |
| |
36 |
| |
37 Index: src/makefiles/Makefile.freebsd |
| |
38 --- src/makefiles/Makefile.freebsd.orig 2010-07-05 20:54:38.000000000 +0200 |
| |
39 +++ src/makefiles/Makefile.freebsd 2010-09-21 09:00:42.000000000 +0200 |
| |
40 @@ -17,7 +17,7 @@ |
| |
41 # Rule for building a shared library from a single .o file |
| |
42 %.so: %.o |
| |
43 ifdef ELF_SYSTEM |
| |
44 - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| |
45 + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| |
46 else |
| |
47 $(LD) $(LDREL) $(LDOUT) $<.obj -x $< |
| |
48 @echo building shared object $@ |
| |
49 Index: src/makefiles/Makefile.linux |
| |
50 --- src/makefiles/Makefile.linux.orig 2010-07-05 20:54:38.000000000 +0200 |
| |
51 +++ src/makefiles/Makefile.linux 2010-09-21 09:01:01.000000000 +0200 |
| |
52 @@ -14,4 +14,4 @@ |
| |
53 |
| |
54 # Rule for building a shared library from a single .o file |
| |
55 %.so: %.o |
| |
56 - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| |
57 + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| |
58 Index: src/makefiles/Makefile.solaris |
| |
59 --- src/makefiles/Makefile.solaris.orig 2010-07-05 20:54:38.000000000 +0200 |
| |
60 +++ src/makefiles/Makefile.solaris 2010-09-21 09:01:22.000000000 +0200 |
| |
61 @@ -19,9 +19,9 @@ |
| |
62 # Rule for building a shared library from a single .o file |
| |
63 %.so: %.o |
| |
64 ifeq ($(GCC), yes) |
| |
65 - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| |
66 + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| |
67 else |
| |
68 - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< |
| |
69 + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< $(SHLIB_LINK) |
| |
70 endif |
| |
71 |
| |
72 sqlmansect = 5sql |