aboutsummaryrefslogtreecommitdiffstats
path: root/community/rethinkdb
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-08-18 20:22:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-08-18 20:23:28 +0000
commit436fef28eec5000a5a2ea793a6c967830e2fa8e6 (patch)
treed566f74f8c846ca53787304d0c2b047eb0c7245f /community/rethinkdb
parent9da3d189ac03b9abdc71f10c9cd863ad3cc1bd52 (diff)
downloadaports-436fef28eec5000a5a2ea793a6c967830e2fa8e6.tar.bz2
aports-436fef28eec5000a5a2ea793a6c967830e2fa8e6.tar.xz
community/rethinkdb: modernize and fix build
We need to fix the paxmarking via a patch
Diffstat (limited to 'community/rethinkdb')
-rw-r--r--community/rethinkdb/APKBUILD33
-rw-r--r--community/rethinkdb/paxmark.patch15
2 files changed, 30 insertions, 18 deletions
diff --git a/community/rethinkdb/APKBUILD b/community/rethinkdb/APKBUILD
index 76cd301318..51a55ba121 100644
--- a/community/rethinkdb/APKBUILD
+++ b/community/rethinkdb/APKBUILD
@@ -5,17 +5,19 @@ pkgver=2.3.6
pkgrel=0
pkgdesc="Distributed powerful and scalable NoSQL database"
url="http://www.rethinkdb.com"
-arch=""
+arch="x86_64"
license="ASL 2.0"
depends=""
makedepends="bash python2 linux-headers bsd-compat-headers m4 paxmark
- protobuf-dev icu-dev libressl-dev curl-dev boost-dev libexecinfo-dev"
+ protobuf-dev icu-dev libressl-dev curl-dev boost-dev libexecinfo-dev
+ "
install="$pkgname.pre-install"
pkgusers=rethinkdb
pkggroups=rethinkdb
subpackages="$pkgname-doc"
source="http://download.rethinkdb.com/dist/$pkgname-$pkgver.tgz
libressl.patch
+ paxmark.patch
rethinkdb.initd
rethinkdb.confd
"
@@ -28,8 +30,7 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--dynamic all \
- --with-system-malloc \
- || return 1
+ --with-system-malloc
local _arch
case $CARCH in
@@ -38,38 +39,34 @@ build() {
esac
export LDFLAGS="$LDFLAGS -lexecinfo"
- make CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" \
- SPLIT_SYMBOLS=1 \
- || paxmark -m \
- build/external/v8_3.30.33.16/build/out/${_arch}.release/mksnapshot
- make CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" \
- SPLIT_SYMBOLS=1 || return 1
+ make CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks"
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
install -Dm 644 "$pkgdir"/etc/$pkgname/default.conf.sample \
- "$pkgdir"/etc/$pkgname/default.conf || return 1
+ "$pkgdir"/etc/$pkgname/default.conf
sed -e 's|# directory=/var/lib/rethinkdb|directory=/var/lib/rethinkdb|' \
-e 's|# pid-file=/var/run/rethinkdb/rethinkdb.pid|pid-file=/var/run/rethinkdb.pid|' \
-e 's|# runuser=rethinkdb|runuser=rethinkdb|' \
-e 's|# rungroup=rethinkdb|rungroup=rethinkdb|' \
- -i "$pkgdir"/etc/$pkgname/default.conf || return 1
- install -d -o $pkgname -g $pkgname "$pkgdir"/var/lib/$pkgname || return 1
+ -i "$pkgdir"/etc/$pkgname/default.conf
+ install -d -o $pkgname -g $pkgname "$pkgdir"/var/lib/$pkgname
install -Dm755 "$srcdir"/$pkgname.initd \
- "$pkgdir"/etc/init.d/$pkgname || return 1
+ "$pkgdir"/etc/init.d/$pkgname
install -Dm644 "$srcdir"/$pkgname.confd \
- "$pkgdir"/etc/conf.d/$pkgname || return 1
- paxmark -m "$pkgdir"/usr/bin/rethinkdb || return 1
+ "$pkgdir"/etc/conf.d/$pkgname
+ paxmark -m "$pkgdir"/usr/bin/rethinkdb
}
doc() {
- default_doc || return 1
+ default_doc
mv "$pkgdir"/etc/$pkgname/*.sample "$subpkgdir"/usr/share/doc/$pkgname
}
sha512sums="653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2 rethinkdb-2.3.6.tgz
9ff727feedc7a9f58e7bf8554dc26e32ebca259b2d5d75ff0d064f5aea7a54c9c94fab16b83a3bc4039d4ae6d6d805d7b129ab9d5f762186d0388adeeff6e67c libressl.patch
+c5a7905c116a2bf7af5ce5f8e6536c61e06ee9ac7cbead0358396e0989141890908eab694f4a88f0dcaf9f4ddcefe751dc7a949cbb4c870d87f61e720ef3b45a paxmark.patch
c27e21073048bd5e8e2ec91303b43ce873748573e2b44ba28ee57ca1b3080afb67e56880b6a6da7a0abf4f2967dce45aa27fe8d6dd44b70d874d776e876ef132 rethinkdb.initd
3a07f9c78ef96b2ca37fca508ee14a644d3c08612f662ba5260182fbfcceba064d20253f1261f56dc0a2c28d1a4d5e2320872c3c4e7595cb7ab4e202eb28ad42 rethinkdb.confd"
diff --git a/community/rethinkdb/paxmark.patch b/community/rethinkdb/paxmark.patch
new file mode 100644
index 0000000000..e008ff9d55
--- /dev/null
+++ b/community/rethinkdb/paxmark.patch
@@ -0,0 +1,15 @@
+diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
+index 5454e76..58bf70e 100644
+--- a/mk/support/pkg/v8.sh
++++ b/mk/support/pkg/v8.sh
+@@ -47,6 +47,10 @@ pkg_install () {
+ *) arch=native ;;
+ esac
+ mode=release
++ pkg_make out/Makefile.$arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
++ pkg_make -C out -f Makefile.$arch.$mode mksnapshot BUILDTYPE=Release builddir="$build_dir/out/$arch.$mode" \
++ CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
++ paxmark -m "$build_dir"/out/$arch.$mode/mksnapshot
+ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
+ for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
+ name=`basename $lib`