aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2019-07-25 07:12:15 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-07-25 07:13:11 +0000
commit4d74c2eae1e73b08951083af250d9a3fbf250ec8 (patch)
tree205cfc55030736921de1744480b2f567a138245b
parent5da2f210450b3376d84164ea3bfe2ea03c277ba7 (diff)
downloadaports-4d74c2eae1e73b08951083af250d9a3fbf250ec8.tar.gz
aports-4d74c2eae1e73b08951083af250d9a3fbf250ec8.tar.bz2
aports-4d74c2eae1e73b08951083af250d9a3fbf250ec8.tar.xz
main/postgresql-bdr: install libpq.so and add libs subpkg
Now that we're conflicting with mainline install libpq.so.* Also add libs subpackage like mainline Ref #10483
-rw-r--r--main/postgresql-bdr/APKBUILD23
1 files changed, 19 insertions, 4 deletions
diff --git a/main/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD
index 02f07a5a2e..362ff1cc7f 100644
--- a/main/postgresql-bdr/APKBUILD
+++ b/main/postgresql-bdr/APKBUILD
@@ -2,7 +2,7 @@
pkgname=postgresql-bdr
pkgver=9.4.14_p1
_pkgver=${pkgver/_p/_bdr}
-pkgrel=3
+pkgrel=4
pkgdesc="A sophisticated object-relational DBMS with bidirectional replication support (BDR)"
url="https://wiki.postgresql.org/wiki/BDR_Administration"
arch="all"
@@ -11,8 +11,9 @@ depends="bash libpq"
install="$pkgname.pre-upgrade"
depends_dev="readline-dev openssl-dev zlib-dev libxml2-dev"
makedepends="$depends_dev perl bison flex-dev"
-subpackages="$pkgname-dev $pkgname-contrib $pkgname-client $pkgname-openrc"
-provides="postgresql=$pkgver postgresql-libs=$pkgver"
+subpackages="$pkgname-dev $pkgname-contrib $pkgname-client $pkgname-openrc
+ $pkgname-libpq $pkgname-libs"
+provides="postgresql=$pkgver"
# Avoid conflicts in provided so:* names with postgresql package.
sonameprefix="$pkgname:"
#FIXME: cannot run with UID=0
@@ -72,7 +73,7 @@ package() {
install -D -m644 "$srcdir"/pgbdr-restore.confd \
"$pkgdir"/etc/conf.d/pgbdr-restore
# conflicts with libpq mainline
- rm "$pkgdir"/usr/lib/libpq.so*
+ # rm "$pkgdir"/usr/lib/libpq.so*
}
client() {
@@ -115,6 +116,20 @@ dev() {
usr/lib/postgresql/pgxs
}
+libpq() {
+ pkgdesc="PostgreSQL libraries"
+ depends=""
+ provides="postgresql-libpq=$pkgname"
+
+ _submv usr/lib/libpq.so.*
+}
+
+libs() {
+ depends=""
+ provides="postgresql-libs=$pkgname"
+ default_libs
+}
+
_submv() {
local path; for path in "$@"; do
mkdir -p "$subpkgdir/${path%/*}"