From 18a2a1a2f2ea180d353058877e181df6b71b94f4 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Wed, 11 Mar 2009 01:36:52 +0000
Subject: [PATCH] Prevent dependent packages from needing to include sys/sdt.h

---
 postgresql-sdt-includes.patch | 51 +++++++++++++++++++++++++++++++++++
 postgresql.spec               | 13 ++++++---
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 postgresql-sdt-includes.patch

diff --git a/postgresql-sdt-includes.patch b/postgresql-sdt-includes.patch
new file mode 100644
index 0000000..6166397
--- /dev/null
+++ b/postgresql-sdt-includes.patch
@@ -0,0 +1,51 @@
+Do not expose pg_trace.h (ie, <sys/sdt.h>) as something that every dependent
+package will need to #include successfully.  Otherwise we'd need to make
+postgresql-devel Require: systemtap-sdt-devel, which doesn't seem like a
+desirable thing to do.  This patch is already applied upstream and won't
+be needed in 8.3.7.
+
+
+diff -Naur postgresql-8.3.6.orig/src/backend/access/transam/xact.c postgresql-8.3.6/src/backend/access/transam/xact.c
+--- postgresql-8.3.6.orig/src/backend/access/transam/xact.c	2008-04-26 19:35:33.000000000 -0400
++++ postgresql-8.3.6/src/backend/access/transam/xact.c	2009-03-10 21:17:26.000000000 -0400
+@@ -33,6 +33,7 @@
+ #include "executor/spi.h"
+ #include "libpq/be-fsstubs.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "pgstat.h"
+ #include "storage/fd.h"
+ #include "storage/lmgr.h"
+diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c postgresql-8.3.6/src/backend/storage/lmgr/lock.c
+--- postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c	2008-03-04 14:54:13.000000000 -0500
++++ postgresql-8.3.6/src/backend/storage/lmgr/lock.c	2009-03-10 21:17:26.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "access/twophase.h"
+ #include "access/twophase_rmgr.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "pgstat.h"
+ #include "utils/memutils.h"
+ #include "utils/ps_status.h"
+diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c
+--- postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c	2008-01-01 14:45:52.000000000 -0500
++++ postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c	2009-03-10 21:17:26.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include "access/multixact.h"
+ #include "access/subtrans.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "storage/ipc.h"
+ #include "storage/proc.h"
+ #include "storage/spin.h"
+diff -Naur postgresql-8.3.6.orig/src/include/c.h postgresql-8.3.6/src/include/c.h
+--- postgresql-8.3.6.orig/src/include/c.h	2008-02-23 14:11:55.000000000 -0500
++++ postgresql-8.3.6/src/include/c.h	2009-03-10 21:17:26.000000000 -0400
+@@ -57,7 +57,6 @@
+ #include "pg_config_os.h"		/* must be before any system header files */
+ #endif
+ #include "postgres_ext.h"
+-#include "pg_trace.h"
+ 
+ #if _MSC_VER >= 1400
+ #define errcode __msvc_errcode
diff --git a/postgresql.spec b/postgresql.spec
index 061c123..d253ba4 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -84,7 +84,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -109,6 +109,7 @@ Patch3: postgresql-logging.patch
 Patch4: postgresql-test.patch
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
+Patch7: postgresql-sdt-includes.patch
 
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -361,6 +362,7 @@ system, including regression tests and benchmarks.
 %patch4 -p1
 # patch5 is applied later
 %patch6 -p1
+%patch7 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -398,8 +400,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64
-%ifarch sparc64
+# use -O1 on sparc64 and alpha
+%ifarch sparc64 alpha
 CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
 %endif
 
@@ -871,6 +873,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar 10 2009 Tom Lane <tgl@redhat.com> 8.3.6-4
+- Prevent dependent packages from needing to include sys/sdt.h
+  (unintended side effect of previous patch)
+- Use -O1 on alpha, per report from Oliver Falk; -O2 tickles gcc bugs
+
 * Sun Mar  8 2009 Tom Lane <tgl@redhat.com> 8.3.6-3
 - Enable tracing via systemtap
 Resolves: #488941