rpms/postgresql/devel postgresql-dtrace.patch, NONE, 1.1 postgresql.spec, 1.128, 1.129

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3274

Modified Files:
	postgresql.spec 
Added Files:
	postgresql-dtrace.patch 
Log Message:
Latest version of systemtap needs the probes.o file to be built again

postgresql-dtrace.patch:
 Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE postgresql-dtrace.patch ---
Latest systemtap versions require the probes.o file after all, per bug #557266.
This patch will be incorporated upstream soon.


diff -Naur postgresql-8.4.2.orig/src/backend/Makefile postgresql-8.4.2/src/backend/Makefile
--- postgresql-8.4.2.orig/src/backend/Makefile	2009-09-05 17:14:13.000000000 -0400
+++ postgresql-8.4.2/src/backend/Makefile	2010-01-20 17:21:37.000000000 -0500
@@ -20,13 +20,13 @@
 
 include $(srcdir)/common.mk
 
-# As of 9/2009:
-# * The probes.o file is necessary for dtrace support on Solaris.
-# * OS X's dtrace doesn't use it and doesn't even recognize the -G option.
-# * Systemtap's dtrace will take -G, but it produces a useless empty file.
-# So, build probes.o only on Solaris.
-# This will likely need adjustment as other platforms add dtrace support.
-ifeq ($(PORTNAME), solaris)
+# As of 1/2010:
+# The probes.o file is necessary for dtrace support on Solaris, and on recent
+# versions of systemtap.  (Older systemtap releases just produce an empty
+# file, but that's okay.)  However, OS X's dtrace doesn't use it and doesn't
+# even recognize the -G option.  So, build probes.o except on Darwin.
+# This might need adjustment as other platforms add dtrace support.
+ifneq ($(PORTNAME), darwin)
 ifeq ($(enable_dtrace), yes)
 LOCALOBJS += utils/probes.o
 endif


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- postgresql.spec	20 Jan 2010 20:46:00 -0000	1.128
+++ postgresql.spec	20 Jan 2010 22:34:36 -0000	1.129
@@ -79,6 +79,7 @@ Patch2: postgresql-ac-version.patch
 Patch3: postgresql-logging.patch
 Patch4: postgresql-oom-adj.patch
 Patch6: postgresql-perl-rpath.patch
+Patch7: postgresql-dtrace.patch
 
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -278,6 +279,7 @@ system, including regression tests and b
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p1
 
 autoconf
 
@@ -700,6 +702,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jan 20 2010 Tom Lane <tgl at redhat.com> 8.4.2-5
+- Latest version of systemtap needs the probes.o file to be built again
+Resolves: #557266
 - Provide script and instructions for building the documentation PDF
 
 * Mon Jan 11 2010 Tom Lane <tgl at redhat.com> 8.4.2-4