From: "Aaron Swenson" <titanofold@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/pgsql-patches:9.1 commit in: /
Date: Wed, 13 Jul 2011 21:52:51 +0000 (UTC) [thread overview]
Message-ID: <ddb050b7b96da2db7f120ccebcc47d109298f6b2.titanofold@gentoo> (raw)
commit: ddb050b7b96da2db7f120ccebcc47d109298f6b2
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:52:33 2011 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:52:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=ddb050b7
Updated for beta 3
---
base.patch | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/base.patch b/base.patch
index 4c8d1b2..9a1b711 100644
--- a/base.patch
+++ b/base.patch
@@ -1,7 +1,7 @@
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile 2011-04-27 17:17:22.000000000 -0400
-+++ b/contrib/Makefile 2011-05-02 18:13:25.185010280 -0400
-@@ -5,54 +5,10 @@
+diff -Naur postgresql-9.1beta3.orig/contrib/Makefile postgresql-9.1beta3/contrib/Makefile
+--- postgresql-9.1beta3.orig/contrib/Makefile 2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/contrib/Makefile 2011-07-13 17:33:27.267411316 -0400
+@@ -5,56 +5,10 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
@@ -52,13 +52,15 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile
-ifeq ($(with_openssl),yes)
-SUBDIRS += sslinfo
+-else
+-ALWAYS_SUBDIRS += sslinfo
-endif
ifeq ($(with_ossp_uuid),yes)
SUBDIRS += uuid-ossp
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile 2011-04-27 17:17:22.000000000 -0400
-+++ b/src/Makefile 2011-05-02 18:14:24.435313471 -0400
+diff -Naur postgresql-9.1beta3.orig/src/Makefile postgresql-9.1beta3/src/Makefile
+--- postgresql-9.1beta3.orig/src/Makefile 2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/Makefile 2011-07-13 17:44:20.182005354 -0400
@@ -14,17 +14,11 @@
SUBDIRS = \
@@ -78,9 +80,9 @@ 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-04-27 17:17:22.000000000 -0400
-+++ b/src/backend/Makefile 2011-05-02 18:19:06.946759115 -0400
+diff -Naur postgresql-9.1beta3.orig/src/backend/Makefile postgresql-9.1beta3/src/backend/Makefile
+--- postgresql-9.1beta3.orig/src/backend/Makefile 2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/backend/Makefile 2011-07-13 17:47:18.641651141 -0400
@@ -45,7 +45,7 @@
##########################################################################
@@ -99,7 +101,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
# run this unconditionally to avoid needing to know its dependencies here:
submake-schemapg:
-@@ -205,23 +205,7 @@
+@@ -206,23 +206,7 @@
##########################################################################
@@ -124,9 +126,9 @@ 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-04-27 17:17:22.000000000 -0400
-+++ b/src/bin/Makefile 2011-05-02 18:20:49.697284900 -0400
+diff -Naur postgresql-9.1beta3.orig/src/bin/Makefile postgresql-9.1beta3/src/bin/Makefile
+--- postgresql-9.1beta3.orig/src/bin/Makefile 2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/bin/Makefile 2011-07-13 17:49:20.174599808 -0400
@@ -13,8 +13,7 @@
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
@@ -134,12 +136,12 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile
-SUBDIRS = initdb pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
+SUBDIRS = pg_dump psql scripts pg_config
+
ifeq ($(PORTNAME), win32)
- 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-04-27 17:17:22.000000000 -0400
-+++ b/src/include/pg_config_manual.h 2011-05-02 18:21:59.197640542 -0400
+ SUBDIRS += pgevent
+diff -Naur postgresql-9.1beta3.orig/src/include/pg_config_manual.h postgresql-9.1beta3/src/include/pg_config_manual.h
+--- postgresql-9.1beta3.orig/src/include/pg_config_manual.h 2011-07-07 20:12:33.000000000 -0400
++++ postgresql-9.1beta3/src/include/pg_config_manual.h 2011-07-13 17:50:30.010547932 -0400
@@ -141,7 +141,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
next reply other threads:[~2011-07-13 21:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-13 21:52 Aaron Swenson [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-18 18:22 [gentoo-commits] proj/pgsql-patches:9.1 commit in: / Aaron Swenson
2011-09-17 15:15 Aaron Swenson
2011-08-27 22:00 Aaron Swenson
2011-08-08 10:58 Aaron Swenson
2011-07-14 10:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-07-04 22:55 Aaron Swenson
2011-03-30 9:49 Aaron Swenson
2011-03-30 9:49 Aaron Swenson
2011-03-19 23:27 Aaron Swenson
2011-03-19 22:51 Aaron Swenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ddb050b7b96da2db7f120ccebcc47d109298f6b2.titanofold@gentoo \
--to=titanofold@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox