summaryrefslogtreecommitdiff
path: root/user/postgresql/perl-rpath.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/postgresql/perl-rpath.patch')
-rw-r--r--user/postgresql/perl-rpath.patch30
1 files changed, 10 insertions, 20 deletions
diff --git a/user/postgresql/perl-rpath.patch b/user/postgresql/perl-rpath.patch
index a2505acf7..f1354488e 100644
--- a/user/postgresql/perl-rpath.patch
+++ b/user/postgresql/perl-rpath.patch
@@ -1,22 +1,12 @@
-We configure Postgres with --disable-rpath because for the most part we
-want to leave it to ldconfig to determine where libraries are. However,
-for some reason the Perl package puts libperl.so in a nonstandard place
-and doesn't add that place to the ldconfig search path. I think this
-is a Perl packaging bug, myself, but apparently it's not going to change.
-So work around it by adding an rpath spec to plperl.so (only).
-
-Alpine notes:
-This patch is copied from Fedora.
-
---- a/src/pl/plperl/GNUmakefile
-+++ b/src/pl/plperl/GNUmakefile
-@@ -43,6 +43,9 @@
+diff -ur a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
+--- a/src/pl/plperl/GNUmakefile 2022-01-08 00:23:39.350000000 +0000
++++ b/src/pl/plperl/GNUmakefile 2022-01-08 00:24:13.230000000 +0000
+@@ -53,7 +53,7 @@
+ endif # win32
- 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-extension=plperl --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
+-SHLIB_LINK = $(perl_embed_ldflags)
++SHLIB_LINK = $(perl_embed_ldflags) $(rpath)
+
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \