summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorRyan S. Northrup <northrup@yellowapple.us>2016-12-10 00:05:34 +0000
committerDavid Spencer <idlemoor@slackbuilds.org>2016-12-10 00:57:38 +0000
commit5a8f837ef3f564d6e376582efb7a54aa0adc2162 (patch)
tree36355ffd44e16815369822dfe67fb6d0cd5faefe /development
parentb5f91e8dbeab6a6de42be0e69801a6611aa67837 (diff)
downloadslackbuilds-5a8f837ef3f564d6e376582efb7a54aa0adc2162.tar.gz
development/couchdb: Fix build with erlang + new maintainer.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/couchdb/couchdb.SlackBuild11
-rw-r--r--development/couchdb/couchdb.info4
2 files changed, 10 insertions, 5 deletions
diff --git a/development/couchdb/couchdb.SlackBuild b/development/couchdb/couchdb.SlackBuild
index 371672b08f..32b5a79a42 100644
--- a/development/couchdb/couchdb.SlackBuild
+++ b/development/couchdb/couchdb.SlackBuild
@@ -14,7 +14,7 @@ PKGSRC=apache-couchdb
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ elif ! grep -q ^couchdb: /etc/passwd 2>/dev/null ; then
exit 1
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,6 +71,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Permit newer Erlang versions
+oldtest='if test $major_version -lt 5 -o $major_version -gt 6; then'
+newtest='if test $major_version -lt 5 -o $major_version -gt 8; then'
+sed -i "s/$oldtest/$newtest/" configure
+
CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/couchdb/couchdb.info b/development/couchdb/couchdb.info
index 7f12588c82..47db1461f6 100644
--- a/development/couchdb/couchdb.info
+++ b/development/couchdb/couchdb.info
@@ -6,5 +6,5 @@ MD5SUM="01a2c8ab4fcde457529428993901a060"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="erlang-otp"
-MAINTAINER="Nicolas Steinmetz"
-EMAIL="nsteinmetz@gmail.com"
+MAINTAINER="Ryan S. Northrup"
+EMAIL="northrup@yellowapple.us"