pool/postgresql
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 41689 from home:coolo:branches:openSUSE:Factory

Browse Source 
Copy from home:coolo:branches:openSUSE:Factory/postgresql via accept of submit request 41689 revision 2.
Request was accepted with message:
self accept

OBS-URL: https://build.opensuse.org/request/show/41689
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2010-06-18 14:11:48 +00:00 committed by Git OBS Bridge
parent 0017637e4b
commit fe82c7846e
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
postgresql-perl-return.patch Normal file
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;
}

12
postgresql-perl-rpath.patch
View File

@ -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,

5
postgresql-pl.changes
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

3
postgresql-pl.spec
View File

@ -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"