From f6af6c0fb92601682b74580e54169a8253705eea Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 28 Apr 2008 23:00:55 +0000 Subject: [PATCH] Fix build breakage on PPC due to incorrect configure test --- postgresql-xslt.patch | 30 ++++++++++++++++++++++++++++++ postgresql.spec | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 postgresql-xslt.patch diff --git a/postgresql-xslt.patch b/postgresql-xslt.patch new file mode 100644 index 0000000..1e2405b --- /dev/null +++ b/postgresql-xslt.patch @@ -0,0 +1,30 @@ +This patch is needed to build successfully on PPC, where the linker is +evidently pickier about functions vs variables than on other Fedora +platforms. Note it is already committed upstream, so we won't need it +in postgres 8.3.2 and later. + + +Index: configure.in +=================================================================== +RCS file: /cvsroot/pgsql/configure.in,v +retrieving revision 1.546.2.3 +diff -c -r1.546.2.3 configure.in +*** configure.in 14 Mar 2008 03:23:22 -0000 1.546.2.3 +--- configure.in 28 Apr 2008 22:41:54 -0000 +*************** +*** 795,801 **** + fi + + if test "$with_libxslt" = yes ; then +! AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) + fi + + # for contrib/uuid-ossp +--- 795,801 ---- + fi + + if test "$with_libxslt" = yes ; then +! AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) + fi + + # for contrib/uuid-ossp diff --git a/postgresql.spec b/postgresql.spec index 6bb8a8b..75d78b8 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -82,7 +82,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -108,6 +108,7 @@ Patch4: postgresql-test.patch Patch5: pgtcl-no-rpath.patch Patch6: postgresql-perl-rpath.patch Patch8: postgresql-prefer-ncurses.patch +Patch9: postgresql-xslt.patch BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -353,6 +354,7 @@ system, including regression tests and benchmarks. # patch5 is applied later %patch6 -p1 %patch8 -p1 +%patch9 -p0 #call autoconf 2.53 or greater %aconfver @@ -841,6 +843,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 28 2008 Tom Lane 8.3.1-3 +- Fix build breakage on PPC due to incorrect configure test +Related: #444317 + * Sat Apr 26 2008 Tom Lane 8.3.1-2 - Clean up cross-subpackage Requires: to ensure that updating any one subpackage brings in the matching versions of others.