summaryrefslogtreecommitdiff
path: root/community/couchdb
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-04-25 00:01:35 +0000
committerroot <root@rshg054.dnsready.net>2012-04-25 00:01:35 +0000
commit98bf2ac3fdd6f7bcb6ce45c932fc13c07fecc03f (patch)
tree00d9cdbfdc8ef5d7a4a7159a8c6439008509e662 /community/couchdb
parent9988621f899d7d4ae5fd0a4a32a4ba3abc5a527d (diff)
Wed Apr 25 00:01:35 UTC 2012
Diffstat (limited to 'community/couchdb')
-rw-r--r--community/couchdb/PKGBUILD28
-rw-r--r--community/couchdb/configure-fix.patch21
2 files changed, 37 insertions, 12 deletions
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 8c405a625..6afbea62a 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 61260 2011-12-26 21:33:37Z spupykin $
+# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-# Previous Contributor: Michael Fellinger <m.fellinger@gmail.com>
+# Contributor: Michael Fellinger <m.fellinger@gmail.com>
pkgname=couchdb
pkgver=1.2.0
-pkgrel=2git20111115
+pkgrel=3
pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
arch=('i686' 'x86_64')
url="http://couchdb.apache.org"
license=('APACHE')
depends=('icu' 'erlang' 'js' 'openssl' 'curl')
-makedepends=('gcc')
install=couchdb.install
options=('!libtool')
backup=('etc/couchdb/local.ini'
'etc/conf.d/couchdb'
'etc/logrotate.d/couchdb')
-#source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz"
-source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz"
- "rc-script.patch")
-md5sums=('b4236a36a473e3a1c81e7548de194c47'
- '8a3b1a1ff98a6411827ad991db7a355b')
+source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
+ "rc-script.patch" "configure-fix.patch")
+md5sums=('a5cbbcaac288831b3d8a08b725657f10'
+ '890a85b22219ea113a4901a289c442f8'
+ '8a3b1a1ff98a6411827ad991db7a355b'
+ 'fd1669544d08bda09c3318873d51db1e')
build() {
cd "$srcdir/apache-$pkgname-$pkgver"
- [ -x configure ] || ./bootstrap
- sed -i 's|-ljs|-lmozjs185|' configure
- [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ # workaround for FS#26827
+ patch -Np1 < $srcdir/configure-fix.patch
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var
make
+
patch -R etc/init/couchdb <$srcdir/rc-script.patch
}
diff --git a/community/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch
new file mode 100644
index 000000000..0bb68ecfe
--- /dev/null
+++ b/community/couchdb/configure-fix.patch
@@ -0,0 +1,21 @@
+diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure
+--- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200
++++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200
+@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err
+ fi
+ fi
+
+-otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
++otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
+
+ if test x$otp_release \> xR13B03; then
+ USE_OTP_NIFS_TRUE=
+@@ -18253,7 +18253,7 @@ else
+ fi
+
+
+-has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
++has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
+
+ if test -n "$has_crypto"; then
+ { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5