Subject: [alpine-aports] [PATCH] main/postgresql: patch and re-enable PL/Perl regression tests

From: Daniel Isaksen <[email-masked]>
Date: Sat, 11 May 2019 23:43:51 +0000

This should sort the issues. Apparently Perl has some changes that makes it
unable to parse the "C.UTF-8" locale, but that's an issue for another day.

The following patch fixes PostgreSQL PL/Perl regression tests on x86_64 and most
likely the other architectures as well.

---
 main/postgresql/APKBUILD                         |  8 +++++---
 main/postgresql/regression-check-no-locale.patch | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 main/postgresql/regression-check-no-locale.patch

diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 108659327e..5d7369d93e 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Jirutka <[email-masked]>
 pkgname=postgresql
 pkgver=11.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A sophisticated object-relational DBMS"
 url="https://www.postgresql.org/"
 arch="all"
@@ -18,14 +18,15 @@ makedepends="$depends_dev libedit-dev zlib-dev libxml2-dev util-linux-dev
 	openldap-dev tcl-dev perl-dev python2-dev python3-dev"
 subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs
 	$pkgname-client $pkgname-pltcl
+	$pkgname-plperl $pkgname-plperl-contrib:plperl_contrib
 	$pkgname-plpython2 $pkgname-plpython2-contrib:plpython2_contrib
 	$pkgname-plpython3 $pkgname-plpython3-contrib:plpython3_contrib"
-#	$pkgname-plperl $pkgname-plperl-contrib:plperl_contrib
 source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
 	initdb.patch
 	perl-rpath.patch
 	conf-unix_socket_directories.patch
 	disable-broken-tests.patch
+	regression-check-no-locale.patch
 	$pkgname.initd
 	$pkgname.confd
 	pg-restore.initd
@@ -117,7 +118,7 @@ _configure() (
 		--with-openssl \
 		--with-uuid=e2fs \
 		--disable-rpath \
-		--without-perl \
+		--with-perl \
 		--with-python \
 		--with-tcl
 )
@@ -309,6 +310,7 @@ sha512sums="03269bb88f44f3a81d5e3a8ca2fe59f63f784436840f08870b2e539755629cbde8ac
 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f  conf-unix_socket_directories.patch
 274e0a5a6e7d179f5327ae2da0274f13d9198d9acbe45f90e2bdadf454f1e32aceac6a1d4ef2b1744c4468994e93b14a38abea877b419b3fd28b8a3273b5d574  disable-broken-tests.patch
+cbcfcf1c9c5faf5113498f6613db871db225971e15b0de2b25df7c2103a16b84a3b839d5cc5b598c0be81b6d437c5ee6e748b8b37939cb7e63b6241203fb9758  regression-check-no-locale.patch
 224e80f9e62843fd248e625abdd0d9fe477729ff3f9a64fc5c86dd37bb7176d3504107fbed7ce578e3a1db7f60b8cf2abf5fe4862c81f76b6d026e29ca495cfc  postgresql.initd
 a6d9cba5c7270484b3a22083b2b37742faefb01b6643040050c92235840c601b2e206ebda32804937b729c6cf42c79a558b921900e52fc420df2a03b5f29e1f7  postgresql.confd
 f5a1cba051e7d846c2d16703514601cb25729ed96b677c9bd0c199d64552120a8b14b238af01917fdb87106681e12dee6fff7447558155ba273e4f96be5e2892  pg-restore.initd
diff --git a/main/postgresql/regression-check-no-locale.patch b/main/postgresql/regression-check-no-locale.patch
new file mode 100644
index 0000000000..67870a5c4f
--- /dev/null
+++ b/main/postgresql/regression-check-no-locale.patch
@@ -0,0 +1,15 @@
+PostgreSQL seems to break when it attempts to run the regression checks. This
+patch adds the --no-locale flag so it runs with the C locale.
+
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 64ce7557ba..e736d407c0 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -628,6 +628,7 @@ pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ tmp
+ pg_regress_check = \
+     $(with_temp_install) \
+     $(top_builddir)/src/test/regress/pg_regress \
++    --no-locale \
+     --temp-instance=./tmp_check \
+     --inputdir=$(srcdir) \
+     --bindir= \
--
2.21.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---