Accepting request 41737 from server:database:postgresql

Copy from server:database:postgresql/postgresql based on submit request 41737 from user coolo

OBS-URL: https://build.opensuse.org/request/show/41737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql?expand=0&rev=23
This commit is contained in:
OBS User autobuild 2010-06-21 15:50:55 +00:00 committed by Git OBS Bridge
commit 0d479ea069
5 changed files with 28 additions and 8 deletions

View File

@ -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;
}

View File

@ -7,15 +7,17 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198. Per bug #162198.
--- src/pl/plperl/GNUmakefile 2009-06-05 14:29:56.000000000 -0400 Index: src/pl/plperl/GNUmakefile
+++ src/pl/plperl/GNUmakefile 2009-08-12 23:28:57.000000000 -0400 ===================================================================
@@ -38,6 +38,9 @@ --- 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) SHLIB_LINK = $(perl_embed_ldflags)
+# Force rpath to be used even though we disable it everywhere else +# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath) +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 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,

View File

@ -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 Thu Mar 11 18:24:28 CET 2010 - max@suse.de

View File

@ -27,13 +27,13 @@ BuildRequires: krb5-devel libxslt-devel
BuildRequires: python-devel tcl-devel BuildRequires: python-devel tcl-devel
Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL
Version: 8.4.4 Version: 8.4.4
Release: 1 Release: 2
%define pg_minor_version %(echo %version | cut -f1-2 -d.) %define pg_minor_version %(echo %version | cut -f1-2 -d.)
License: BSD3c(or similar) License: BSD3c(or similar)
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Source0: postgresql-%version.tar.bz2 Source0: postgresql-%version.tar.bz2
NoSource: 0
Patch0: postgresql-perl-rpath.patch Patch0: postgresql-perl-rpath.patch
Patch1: postgresql-perl-return.patch
Url: http://www.postgresql.org/ Url: http://www.postgresql.org/
Requires: postgresql-server = %pg_minor_version Requires: postgresql-server = %pg_minor_version
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -115,6 +115,7 @@ and triggers.
# in the postgresql source RPM. # in the postgresql source RPM.
%setup -q -n postgresql-%{version} %setup -q -n postgresql-%{version}
%patch0 %patch0
%patch1 -p1
%build %build
export CFLAGS="%optflags $SP" export CFLAGS="%optflags $SP"

View File

@ -26,7 +26,7 @@ BuildRequires: krb5-devel libxslt-devel
%endif %endif
Summary: Basic Clients and Utilities for PostgreSQL Summary: Basic Clients and Utilities for PostgreSQL
Version: 8.4.4 Version: 8.4.4
Release: 1 Release: 2
%define pg_minor_version %(echo %version | cut -f1-2 -d.) %define pg_minor_version %(echo %version | cut -f1-2 -d.)
License: BSD3c(or similar) License: BSD3c(or similar)
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools