diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-07-24 13:32:16 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-07-24 13:34:12 +0000 |
| commit | f6ee808741094b25f088c5502a14da11d3a24c02 (patch) | |
| tree | dc6cad840b9c26116830ba7de4b38648d6314ab2 /main | |
| parent | 2c49ce286bac1d18bd5399a47b2ac42724797b2f (diff) | |
| download | aports-f6ee808741094b25f088c5502a14da11d3a24c02.tar.bz2 aports-f6ee808741094b25f088c5502a14da11d3a24c02.tar.xz | |
main/postgresql-bdr: solve conflict with postgresql mainline
Don't attempt to allow coexisting mixed mainline/bdr client/server versions
Fixes #10483
Diffstat (limited to 'main')
| -rw-r--r-- | main/postgresql-bdr/APKBUILD | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/main/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD index f8553f7e01..02f07a5a2e 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=2 +pkgrel=3 pkgdesc="A sophisticated object-relational DBMS with bidirectional replication support (BDR)" url="https://wiki.postgresql.org/wiki/BDR_Administration" arch="all" @@ -12,7 +12,7 @@ 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" +provides="postgresql=$pkgver postgresql-libs=$pkgver" # Avoid conflicts in provided so:* names with postgresql package. sonameprefix="$pkgname:" #FIXME: cannot run with UID=0 @@ -28,7 +28,6 @@ source="http://packages.2ndquadrant.com/postgresql-bdr94-2ndquadrant/tarballs/po builddir="$srcdir/$pkgname-$_pkgver" prepare() { - cd "$builddir" default_prepare # sanity check of conf.d @@ -43,8 +42,6 @@ prepare() { } build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -61,13 +58,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - # Don't install docs make DESTDIR="$pkgdir" install @@ -83,7 +77,7 @@ package() { client() { pkgdesc="PostgreSQL Client Utilities" - provides="postgresql-client=$pkgname-$pkgver" + provides="postgresql-client=$pkgver" mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin # mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib @@ -106,12 +100,28 @@ client() { contrib() { pkgdesc="Extension modules distributed with PostgreSQL" - depends="" + provides="postgresql-contrib=$pkgver" cd "$builddir" make DESTDIR="$subpkgdir" FLEX="/usr/bin/flex" -C contrib install } +dev() { + provides="postgresql-dev=$pkgver" + default_dev + + _submv usr/bin/pg_config \ + usr/bin/ecpg \ + usr/lib/postgresql/pgxs +} + +_submv() { + local path; for path in "$@"; do + mkdir -p "$subpkgdir/${path%/*}" + mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/ + done +} + sha512sums="cd8fec782c201270270d4abfa59296083889bf22f63b4e18f758e8262ee52deeae247d813a3e8633861819d803cb369157854de446affdde65c1e12477bbc0b8 postgresql-bdr-9.4.14_bdr1.tar.bz2 6f7fdceb1a5aba3f00894ae88afdf25e5f9c7a0ffc00b11211011a6415ea73639d6a67f516cab66c6487484bab26ded3c93471d6d41ac0d3822926c22274f2ba initdb.patch 1973863bfc208ce20ca2dd82557ebbd4fcddd1219d6a80f2e83550d0110d39f034cb829cca3ee9208f513a24b032267b94559c740ddddb10a4f24c630194eb5e postgresql-bdr-osxflags.patch |