From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] postgresql12: fix cross building of dependent packages
Date: Sat, 11 Jul 2020 23:59:12 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23528@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org postgresql-libs-devel
https://github.com/void-linux/void-packages/pull/23528
postgresql12: fix cross building of dependent packages
Fixes building few packages, rest still to test.
A patch file from https://github.com/void-linux/void-packages/pull/23528.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-postgresql-libs-devel-23528.patch --]
[-- Type: text/x-diff, Size: 2850 bytes --]
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
next reply other threads:[~2020-07-11 21:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-11 21:59 Chocimier [this message]
2020-07-11 21:59 ` Chocimier
2020-07-12 23:59 ` [PR REVIEW] " fosslinux
2020-07-13 16:23 ` Chocimier
2020-07-14 17:31 ` [PR PATCH] [Updated] " Chocimier
2020-07-14 19:35 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23528@inbox.vuxu.org \
--to=chocimier@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).