diff options
author | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-30 05:49:16 -0400 |
---|---|---|
committer | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-30 05:49:16 -0400 |
commit | 9b91cddb03b5c23d9e7f583520586afad2ced728 (patch) | |
tree | 2fa3857de19005420e3f36c42dc7b28378b6b412 | |
parent | Filename consistent with other branches. (diff) | |
download | patches-9b91cddb03b5c23d9e7f583520586afad2ced728.tar.gz patches-9b91cddb03b5c23d9e7f583520586afad2ced728.tar.bz2 patches-9b91cddb03b5c23d9e7f583520586afad2ced728.zip |
Updated for 9.1alpha5
-rw-r--r-- | base.patch | 27 |
1 files changed, 13 insertions, 14 deletions
@@ -1,7 +1,7 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile ---- a/contrib/Makefile 2011-03-09 09:19:24.000000000 -0500 -+++ b/contrib/Makefile 2011-03-18 18:44:16.832829001 -0400 -@@ -5,55 +5,10 @@ +--- a/contrib/Makefile 2011-03-28 09:42:09.000000000 -0400 ++++ b/contrib/Makefile 2011-03-29 20:18:08.394999851 -0400 +@@ -5,54 +5,10 @@ include $(top_builddir)/src/Makefile.global SUBDIRS = \ @@ -53,13 +53,12 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile -ifeq ($(with_openssl),yes) -SUBDIRS += sslinfo -endif -- + ifeq ($(with_ossp_uuid),yes) SUBDIRS += uuid-ossp - endif diff -Naur a/src/Makefile b/src/Makefile ---- a/src/Makefile 2011-03-09 09:19:24.000000000 -0500 -+++ b/src/Makefile 2011-03-18 18:52:50.115898001 -0400 +--- a/src/Makefile 2011-03-28 09:42:09.000000000 -0400 ++++ b/src/Makefile 2011-03-29 20:19:45.356494851 -0400 @@ -14,17 +14,11 @@ SUBDIRS = \ @@ -80,8 +79,8 @@ diff -Naur a/src/Makefile b/src/Makefile # There are too many interdependencies between the subdirectories, so # don't attempt parallel make here. diff -Naur a/src/backend/Makefile b/src/backend/Makefile ---- a/src/backend/Makefile 2011-03-09 09:19:24.000000000 -0500 -+++ b/src/backend/Makefile 2011-03-18 18:48:58.775898001 -0400 +--- a/src/backend/Makefile 2011-03-28 09:42:09.000000000 -0400 ++++ b/src/backend/Makefile 2011-03-29 20:24:25.836184851 -0400 @@ -45,7 +45,7 @@ ########################################################################## @@ -100,7 +99,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile # run this unconditionally to avoid needing to know its dependencies here: submake-schemapg: -@@ -203,23 +203,7 @@ +@@ -205,23 +205,7 @@ ########################################################################## @@ -126,8 +125,8 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile install-bin: postgres $(POSTGRES_IMP) installdirs $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' diff -Naur a/src/bin/Makefile b/src/bin/Makefile ---- a/src/bin/Makefile 2011-03-09 09:19:24.000000000 -0500 -+++ b/src/bin/Makefile 2011-03-18 18:50:41.615898001 -0400 +--- a/src/bin/Makefile 2011-03-28 09:42:09.000000000 -0400 ++++ b/src/bin/Makefile 2011-03-29 20:25:34.162004851 -0400 @@ -13,8 +13,7 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global @@ -139,8 +138,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile SUBDIRS+=pgevent endif diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h ---- a/src/include/pg_config_manual.h 2011-03-09 09:19:24.000000000 -0500 -+++ b/src/include/pg_config_manual.h 2011-03-18 18:51:36.835898001 -0400 +--- a/src/include/pg_config_manual.h 2011-03-28 09:42:09.000000000 -0400 ++++ b/src/include/pg_config_manual.h 2011-03-29 20:26:50.973579851 -0400 @@ -141,7 +141,7 @@ * here's where to twiddle it. You can also override this at runtime * with the postmaster's -k switch. |