postgresql/postgresql.patch@870131689a5c (annotated)
postgresql/postgresql.patch
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- child 699
- da76d565ccd3
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
| michael@300 | 1 | Index: src/Makefile.shlib |
| michael@300 | 2 | --- src/Makefile.shlib.orig 2010-07-06 05:55:33.000000000 +0200 |
| michael@300 | 3 | +++ src/Makefile.shlib 2010-09-21 08:58:56.000000000 +0200 |
| michael@300 | 4 | @@ -329,7 +329,7 @@ |
| michael@300 | 5 | |
| michael@300 | 6 | .PHONY: all-lib all-static-lib all-shared-lib |
| michael@300 | 7 | |
| michael@300 | 8 | -all-lib: all-shared-lib |
| michael@300 | 9 | +all-lib: |
| michael@300 | 10 | ifdef soname |
| michael@300 | 11 | # no static library when building a dynamically loadable module |
| michael@300 | 12 | all-lib: all-static-lib |
| michael@300 | 13 | Index: src/backend/Makefile |
| michael@300 | 14 | --- src/backend/Makefile.orig 2010-07-05 20:54:37.000000000 +0200 |
| michael@300 | 15 | +++ src/backend/Makefile 2010-09-21 08:58:56.000000000 +0200 |
| michael@300 | 16 | @@ -41,7 +41,7 @@ |
| michael@300 | 17 | LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE) |
| michael@300 | 18 | |
| michael@300 | 19 | # The backend doesn't need everything that's in LIBS, however |
| michael@300 | 20 | -LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) |
| michael@300 | 21 | +LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) |
| michael@300 | 22 | |
| michael@300 | 23 | ########################################################################## |
| michael@300 | 24 | |
| michael@300 | 25 | Index: src/include/port.h |
| michael@300 | 26 | --- src/include/port.h.orig 2010-05-15 16:44:13.000000000 +0200 |
| michael@300 | 27 | +++ src/include/port.h 2010-09-21 08:58:56.000000000 +0200 |
| michael@300 | 28 | @@ -374,7 +374,7 @@ |
| michael@300 | 29 | extern int getopt(int nargc, char *const * nargv, const char *ostr); |
| michael@300 | 30 | #endif |
| michael@300 | 31 | |
| michael@300 | 32 | -#ifndef HAVE_ISINF |
| michael@300 | 33 | +#if !defined(HAVE_ISINF) && !defined(__FreeBSD__) |
| michael@300 | 34 | extern int isinf(double x); |
| michael@300 | 35 | #endif |
| michael@300 | 36 | |
| michael@300 | 37 | Index: src/makefiles/Makefile.freebsd |
| michael@300 | 38 | --- src/makefiles/Makefile.freebsd.orig 2010-07-05 20:54:38.000000000 +0200 |
| michael@300 | 39 | +++ src/makefiles/Makefile.freebsd 2010-09-21 09:00:42.000000000 +0200 |
| michael@300 | 40 | @@ -17,7 +17,7 @@ |
| michael@300 | 41 | # Rule for building a shared library from a single .o file |
| michael@300 | 42 | %.so: %.o |
| michael@300 | 43 | ifdef ELF_SYSTEM |
| michael@300 | 44 | - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| michael@300 | 45 | + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| michael@300 | 46 | else |
| michael@300 | 47 | $(LD) $(LDREL) $(LDOUT) $<.obj -x $< |
| michael@300 | 48 | @echo building shared object $@ |
| michael@300 | 49 | Index: src/makefiles/Makefile.linux |
| michael@300 | 50 | --- src/makefiles/Makefile.linux.orig 2010-07-05 20:54:38.000000000 +0200 |
| michael@300 | 51 | +++ src/makefiles/Makefile.linux 2010-09-21 09:01:01.000000000 +0200 |
| michael@300 | 52 | @@ -14,4 +14,4 @@ |
| michael@300 | 53 | |
| michael@300 | 54 | # Rule for building a shared library from a single .o file |
| michael@300 | 55 | %.so: %.o |
| michael@300 | 56 | - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| michael@300 | 57 | + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| michael@300 | 58 | Index: src/makefiles/Makefile.solaris |
| michael@300 | 59 | --- src/makefiles/Makefile.solaris.orig 2010-07-05 20:54:38.000000000 +0200 |
| michael@300 | 60 | +++ src/makefiles/Makefile.solaris 2010-09-21 09:01:22.000000000 +0200 |
| michael@300 | 61 | @@ -19,9 +19,9 @@ |
| michael@300 | 62 | # Rule for building a shared library from a single .o file |
| michael@300 | 63 | %.so: %.o |
| michael@300 | 64 | ifeq ($(GCC), yes) |
| michael@300 | 65 | - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< |
| michael@300 | 66 | + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK) |
| michael@300 | 67 | else |
| michael@300 | 68 | - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< |
| michael@300 | 69 | + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< $(SHLIB_LINK) |
| michael@300 | 70 | endif |
| michael@300 | 71 | |
| michael@300 | 72 | sqlmansect = 5sql |
