From ccf648069f17b72ed7d00a5438425dded71deab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 9 Jul 2020 01:09:08 +0200
Subject: [PATCH] postgresql12: fix cross building of dependent packages

---
 srcpkgs/postgresql12/files/pg_config.sh.in |  8 ++++----
 srcpkgs/postgresql12/template              | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/postgresql12/files/pg_config.sh.in b/srcpkgs/postgresql12/files/pg_config.sh.in
index bb650910a90..3d20d215d0b 100644
--- a/srcpkgs/postgresql12/files/pg_config.sh.in
+++ b/srcpkgs/postgresql12/files/pg_config.sh.in
@@ -5,14 +5,14 @@ print() {
 	printf '%s\n' "$@"
 }
 
-sysroot="$(cd "${0%@PREFIX@/*}" && pwd)"
+sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
 
 BINDIR="$sysroot/@PREFIX@/bin"
 DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
 HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-INCLUDEDIR="$sysroot/@PREFIX@/include"
-PKGINCLUDEDIR="$sysroot/@PREFIX@/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/@PREFIX@/include/postgresql/server"
+INCLUDEDIR="$sysroot/usr/include"
+PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
+INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
 LIBDIR="$sysroot/@PREFIX@/lib"
 PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
 LOCALEDIR="$sysroot/@PREFIX@/share/locale"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 2739ba1e7b6..8544977a2b8 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.3
-revision=1
+revision=5
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -60,6 +60,7 @@ pre_configure() {
 	done
 	configure_args="--prefix=/${_prefix}
 	 --sysconfdir=/${_prefix}/etc
+	 --includedir=/usr/include
 	 ${configure_args}"
 }
 
@@ -68,7 +69,6 @@ post_build() {
 }
 
 pre_check() {
-	echo ln -sr tmp_install/${_prefix} /${_prefix%/*}
 	ln -sr tmp_install/${_prefix} /${_prefix%/*}
 }
 
@@ -129,16 +129,17 @@ postgresql-libs-devel_package() {
 	short_desc="PostgreSQL shared libraries (development files)"
 	conflicts="postgresql9.6-libs-devel>=0"
 	pkg_install() {
-		mkdir -p "${PKGDESTDIR}/usr/bin"
+		vmkdir usr/bin
+		vmkdir usr/lib
 		for f in pg_config ecpg; do
 			vmove ${_prefix}/bin/${f}
 			vmove "usr/share/man/man1/$(basename ${f})*"
 			ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
 		done
 		vmove usr/bin/pg_config.sh
-		vmove ${_prefix}/include
+		vmove usr/include
 		vmove "${_prefix}/lib/*.a"
-		vmove "${_prefix}/lib/pkgconfig/*"
+		mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
 		vmove usr/share/man/man3
 		vmove ${_prefix}/lib/postgresql/pgxs
 		for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do