diff --git a/postgresql-perl-return.patch b/postgresql-perl-return.patch new file mode 100644 index 0000000..0bd63cc --- /dev/null +++ b/postgresql-perl-return.patch @@ -0,0 +1,12 @@ +Index: postgresql-8.4.4/src/pl/plperl/plperl.c +=================================================================== +--- postgresql-8.4.4.orig/src/pl/plperl/plperl.c 2010-05-13 18:40:36.000000000 +0200 ++++ postgresql-8.4.4/src/pl/plperl/plperl.c 2010-06-18 10:18:15.758499052 +0200 +@@ -535,6 +535,7 @@ pp_require_safe(pTHX) + RETPUSHYES; + + DIE(aTHX_ "Unable to load %s into plperl", name); ++ return 0; + } + + diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch index bba62b9..a6b6bf4 100644 --- a/postgresql-perl-rpath.patch +++ b/postgresql-perl-rpath.patch @@ -7,15 +7,17 @@ So work around it by adding an rpath spec to plperl.so (only). Per bug #162198. ---- src/pl/plperl/GNUmakefile 2009-06-05 14:29:56.000000000 -0400 -+++ src/pl/plperl/GNUmakefile 2009-08-12 23:28:57.000000000 -0400 -@@ -38,6 +38,9 @@ +Index: src/pl/plperl/GNUmakefile +=================================================================== +--- src/pl/plperl/GNUmakefile.orig 2010-05-13 18:40:36.000000000 +0200 ++++ src/pl/plperl/GNUmakefile 2010-06-18 10:10:04.296498028 +0200 +@@ -38,6 +38,9 @@ OBJS = plperl.o spi_internal.o SPI.o SHLIB_LINK = $(perl_embed_ldflags) +# Force rpath to be used even though we disable it everywhere else +SHLIB_LINK += $(rpath) + - REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl + REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl --load-language=plperlu REGRESS = plperl plperl_trigger plperl_shared plperl_elog - # where to find psql for running the tests + # if Perl can support two interpreters in one backend, diff --git a/postgresql-pl.changes b/postgresql-pl.changes index 0e11d4b..ec23a49 100644 --- a/postgresql-pl.changes +++ b/postgresql-pl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 18 08:42:42 UTC 2010 - coolo@novell.com + +- fix build + ------------------------------------------------------------------- Thu Mar 11 18:24:28 CET 2010 - max@suse.de diff --git a/postgresql-pl.spec b/postgresql-pl.spec index 46b1fb6..f08306e 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -32,8 +32,8 @@ Release: 1 License: BSD3c(or similar) Group: Productivity/Databases/Servers Source0: postgresql-%version.tar.bz2 -NoSource: 0 Patch0: postgresql-perl-rpath.patch +Patch1: postgresql-perl-return.patch Url: http://www.postgresql.org/ Requires: postgresql-server = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -115,6 +115,7 @@ and triggers. # in the postgresql source RPM. %setup -q -n postgresql-%{version} %patch0 +%patch1 -p1 %build export CFLAGS="%optflags $SP"