From 82ed47a4386337d593515e9aff2edbab80552f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 14 Jul 2020 19:30:16 +0200 Subject: [PATCH 1/2] postgresql-libs: 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..752c6e3f9fe 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=2 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 From 1daa85f85121e1fb1d0e55f4800909bb33b5cd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 14 Jul 2020 19:30:16 +0200 Subject: [PATCH 2/2] kdb: rebuild for postgresql12 --- srcpkgs/kdb/patches/postgresql12.patch | 36 ++++++++++++++++++++++++++ srcpkgs/kdb/template | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kdb/patches/postgresql12.patch diff --git a/srcpkgs/kdb/patches/postgresql12.patch b/srcpkgs/kdb/patches/postgresql12.patch new file mode 100644 index 00000000000..bb1d32ab41d --- /dev/null +++ b/srcpkgs/kdb/patches/postgresql12.patch @@ -0,0 +1,36 @@ +From 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 29 Oct 2019 07:52:32 +0100 +Subject: [PATCH] PgSQL driver: fix build with PostgreSQL 12+ + +ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped. +--- + src/drivers/postgresql/PostgresqlTypes.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git src/drivers/postgresql/PostgresqlTypes.cpp src/drivers/postgresql/PostgresqlTypes.cpp +index ea576d69..0697129e 100644 +--- src/drivers/postgresql/PostgresqlTypes.cpp ++++ src/drivers/postgresql/PostgresqlTypes.cpp +@@ -36,6 +36,7 @@ + #endif + #include + #include // needed for BOOLOID, etc. ++#include // needed for PG_VERSION_NUM + + #ifdef _MSC_VER + #pragma warning( pop ) +@@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap() + //! @todo POLYGONOID geometric polygon '(pt1,...)' + m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double); + m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double); ++#if PG_VERSION_NUM < 120000 + m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date); + m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date); ++#endif + //! @todo TINTERVALOID (abstime,abstime), time interval + //! @todo CIRCLEOID geometric circle '(center,radius)' + //! @todo CASHOID monetary amounts, $d,ddd.cc +-- +GitLab + diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template index bb8478e6e04..74c7fedfdd8 100644 --- a/srcpkgs/kdb/template +++ b/srcpkgs/kdb/template @@ -1,7 +1,7 @@ # Template file for 'kdb' pkgname=kdb version=3.2.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons" makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel