From 3f0aa8e96c1c8b07189245517201714d516d78ba Mon Sep 17 00:00:00 2001 From: nopjmp Date: Thu, 16 Jul 2015 20:56:08 -0500 Subject: [PATCH] couchdb: fix build with erlang 18 0001-build-support-OTP-18.0.patch -> from upstream fix-configure.patch -> tarballs have configure generated by autoconf already, regen --- .../patches/0001-build-support-OTP-18.0.patch | 76 +++++++++++++++++++ srcpkgs/couchdb/patches/fix-configure.patch | 38 ++++++++++ 2 files changed, 114 insertions(+) create mode 100644 srcpkgs/couchdb/patches/0001-build-support-OTP-18.0.patch create mode 100644 srcpkgs/couchdb/patches/fix-configure.patch diff --git a/srcpkgs/couchdb/patches/0001-build-support-OTP-18.0.patch b/srcpkgs/couchdb/patches/0001-build-support-OTP-18.0.patch new file mode 100644 index 00000000000..8343f776cb9 --- /dev/null +++ b/srcpkgs/couchdb/patches/0001-build-support-OTP-18.0.patch @@ -0,0 +1,76 @@ +--- /tmp/uHVDRN_INSTALL.Unix 2015-07-16 20:50:58.709145634 -0500 ++++ INSTALL.Unix 2015-07-16 20:50:45.781145327 -0500 +@@ -39,7 +39,7 @@ + + You should have the following installed: + +- * Erlang OTP (>=R14B01, ==R14B01, ==14B01, =14B01, =4.*) (http://icu-project.org/) + * OpenSSL (>=0.9.8r) (http://www.openssl.org/) + * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/) +--- /tmp/rXCQPu_configure.ac 2015-07-16 20:50:58.719145634 -0500 ++++ configure.ac 2015-07-16 20:50:45.782145327 -0500 +@@ -411,7 +411,7 @@ + + { $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 (erts-7.0)" + + version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" + major_version=`echo $version | ${AWK} "{print \\$1}"` +@@ -419,7 +419,7 @@ + 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 @@ + 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 "\ +--- /tmp/lQzdll_unix.rst 2015-07-16 20:50:58.724145634 -0500 ++++ share/doc/src/install/unix.rst 2015-07-16 20:50:45.801145327 -0500 +@@ -52,7 +52,7 @@ + + You should have the following installed: + +-* `Erlang OTP (>=R14B01, =`_ ++* `Erlang OTP (>=R14B01, =`_ + * `ICU `_ + * `OpenSSL `_ + * `Mozilla SpiderMonkey (1.8.5) `_ +--- /tmp/nUxhRb_windows.rst 2015-07-16 20:50:58.728145635 -0500 ++++ share/doc/src/install/windows.rst 2015-07-16 20:50:45.801145327 -0500 +@@ -90,7 +90,7 @@ + + You should have the following installed: + +-* `Erlang OTP (>=14B01, `_ ++* `Erlang OTP (>=14B01, `_ + * `ICU (>=4.*) `_ + * `OpenSSL (>0.9.8r) `_ + * `Mozilla SpiderMonkey (=1.8.5) `_ diff --git a/srcpkgs/couchdb/patches/fix-configure.patch b/srcpkgs/couchdb/patches/fix-configure.patch new file mode 100644 index 00000000000..35ce369a9ff --- /dev/null +++ b/srcpkgs/couchdb/patches/fix-configure.patch @@ -0,0 +1,38 @@ +--- configure.orig 2015-07-16 20:45:43.942138153 -0500 ++++ configure 2015-07-16 20:44:30.432136406 -0500 +@@ -18532,7 +18532,7 @@ + + { $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 (erts-7.0)" + + version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0" + major_version=`echo $version | ${AWK} "{print \\$1}"` +@@ -18540,7 +18540,7 @@ + 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 8; then + as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 + fi + +@@ -18559,7 +18559,7 @@ + + + +- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then ++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then + USE_OTP_NIFS_TRUE= + USE_OTP_NIFS_FALSE='#' + else +@@ -18567,7 +18567,7 @@ + USE_OTP_NIFS_FALSE= + fi + +- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then ++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then + USE_EJSON_COMPARE_NIF_TRUE= + USE_EJSON_COMPARE_NIF_FALSE='#' + else