[arch-commits] Commit in couchdb/trunk (PKGBUILD erlang18.patch)

[Evangelos Foutras]

    Date: Sunday, November 1, 2015 @ 12:00:19
  Author: foutrelis
Revision: 145421

Allow building with Erlang/OTP 18.x

Added:
  couchdb/trunk/erlang18.patch
Modified:
  couchdb/trunk/PKGBUILD

----------------+
 PKGBUILD       |    4 ++++
 erlang18.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-01 10:32:29 UTC (rev 145420)
+++ PKGBUILD	2015-11-01 11:00:19 UTC (rev 145421)
@@ -19,10 +19,12 @@
 validpgpkeys=('E0AF0A194D55C84E4A19A801CDB0C0F904F4EE9B')
 #source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60"
 source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
+        "erlang18.patch"
 	"couchdb.service"
 	"couchdb.tmpfiles")
 md5sums=('01a2c8ab4fcde457529428993901a060'
          'SKIP'
+         '8488bf9f7b07b40a39ff5448e3509905'
          '8914a7ffc6745f94106d96206709acb4'
          '1e254ebe32eeb061be64193bafa35dbf')
 
@@ -29,6 +31,8 @@
 prepare() {
   cd "$srcdir/apache-couchdb-$pkgver"
   sed -i 's|-Werror||g' src/couchdb/priv/Makefile.*
+  patch -Np1 -i ../erlang18.patch
+  autoreconf -vi
 }
 
 build() {

Added: erlang18.patch
===================================================================
--- erlang18.patch	                        (rev 0)
+++ erlang18.patch	2015-11-01 11:00:19 UTC (rev 145421)
@@ -0,0 +1,33 @@
+diff -uprb apache-couchdb-1.6.1.orig/configure.ac apache-couchdb-1.6.1/configure.ac
+--- apache-couchdb-1.6.1.orig/configure.ac	2014-08-22 02:15:33.000000000 +0300
++++ apache-couchdb-1.6.1/configure.ac	2015-11-01 12:54:40.661544158 +0200
+@@ -411,7 +411,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
+ $as_echo_n "checking Erlang version compatibility... " >&6; }
+-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18.x (erts-7.x)"
+ 
+ version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
+ major_version=`echo $version | ${AWK} "{print \\$1}"`
+@@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{
+ patch_version=`echo $version | ${AWK} "{print \\$3}"`
+ echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
+ 
+-if test $major_version -lt 5 -o $major_version -gt 6; then
++if test $major_version -lt 5 -o $major_version -gt 7; then
+     as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
+ fi
+ 
+@@ -438,9 +438,9 @@ otp_release="`\
+ AC_SUBST(otp_release)
+ 
+ AM_CONDITIONAL([USE_OTP_NIFS],
+-    [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
++    [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")])
+ AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
+-    [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
++    [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")])
+ 
+ has_crypto=`\
+     ${ERL} -eval "\