rpms/postgresql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Latest version of systemtap needs the probes.o file to be built again

Browse Source
This commit is contained in:
Tom Lane 2010-01-20 22:34:36 +00:00
parent 63cfa0eb28
commit 962b39e67e
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
postgresql-dtrace.patch Normal file
View File

@ -0,0 +1,28 @@
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

4
postgresql.spec
View File

@ -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 benchmarks.
%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@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@redhat.com> 8.4.2-4