<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/76abb9a60a3bdc8b2c885cd988cadc0659939f1b">https://github.com/macports/macports-ports/commit/76abb9a60a3bdc8b2c885cd988cadc0659939f1b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 76abb9a60a3bdc8b2c885cd988cadc0659939f1b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 17 13:54:15 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> erlang: Update to 23.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61455
</span>---
lang/erlang/Portfile | 31 +++++-----
.../files/patch-erts_emulator_Makefile.in.diff | 12 ++--
.../files/patch-erts_emulator_sys_unix_ddll.c.diff | 6 +-
lang/erlang/files/patch-lib_wx_configure.in.diff | 10 ++--
lang/erlang/files/patch-make-configure.diff | 70 ++++++++++++++++++++++
5 files changed, 102 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/Portfile b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20b5315f3ae..e7233a726da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name erlang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 23.1
</span> revision 0
categories lang erlang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,23 +42,24 @@ distfiles otp_src_${version}${extract.suffix} \
</span> otp_doc_man_${version}${extract.suffix} \
otp_doc_html_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums otp_src_23.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2d6949131c3bcfa0e1d9bb9fefa79f40fbd21d1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 42dcf3c721f4de59fe74ae7b65950c2174c46dc8d1dd4e27c0594d86f606a635 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 88865562 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_man_23.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f3241039f75a869623bac700dd3d69015930b0cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c0804cb5bead8780de24cf9ba656efefd9307a457e0541cc513109523731bf6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1383486 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_html_23.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 187c4cc724bf5bce56fe66b3427bc31438c58d38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4da19f0de96d1c516d91c621a5ddf20837303cc25695b944e263e3ea46dd31da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36238699
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums otp_src_23.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9eefc2a9ab080fe32631a4bd3abc322cdf609c0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cb5b7246eeaac9298c51c9915386df2f784e82a3f7ff93b68453591f0b370400 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 89063191 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_man_23.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6d34113ccda6de7b1ca68149bba40420f8726e3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f49ecbb05b0895ec54fc66ea65b4e7cf593a4877748acc4d549f7613c92b94a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1384042 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_html_23.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2a51abbe2a1da25750738628da66a11e16e95afa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e0075f174db2f9b5a0f861263062942e5a721c40ec747356e482e3be2fb8931 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 36285075
</span>
worksrcdir otp_src_${version}
# http://www.erlang.org/pipermail/erlang-bugs/2009-January/001171.html
patchfiles patch-erts_emulator_Makefile.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-make-configure.diff
</span>
configure.args --prefix=${prefix} \
--enable-threads \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +115,7 @@ platform darwin 10 {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} in [list arm64 ppc64 x86_64]} {
</span> configure.args-append --enable-darwin-64bit
} else {
configure.args-append --disable-darwin-64-bit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +143,8 @@ variant ssl description {Build SSL support} {
</span> depends_lib-append path:lib/libssl.dylib:openssl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# HiPE will go away in a future version of erlang so this variant can be removed then.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/erlang/otp/pull/2854
</span> variant hipe description {Enable HiPE (native-code bytecode compiler)} {
configure.args-delete --disable-hipe
configure.args-append --enable-hipe
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-erts_emulator_Makefile.in.diff b/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 943e73844dd..31b16338ed0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- erts/emulator/Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ erts/emulator/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,12 @@ THR_DEFS=@EMU_THR_DEFS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HiPE will be removed so maybe the first part of the patch can go away then.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/erlang/otp/pull/2854
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- erts/emulator/Makefile.in.orig 2020-09-22 14:11:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ erts/emulator/Makefile.in 2020-11-17 12:58:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,12 @@
</span> M4FLAGS=
CREATE_DIRS=
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +15,8 @@
</span> +LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
ARFLAGS=rc
OMIT_OMIT_FP=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +130,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TYPE_LIBS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,7 +175,7 @@
</span> override TYPE=opt
PURIFY =
TYPEMARKER =
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff b/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a8f25e8653..506535d95cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ erts/emulator/sys/unix/erl_unix_sys_ddll.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,13 @@ static char **errcodes = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig 2020-09-22 14:11:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ erts/emulator/sys/unix/erl_unix_sys_ddll.c 2020-11-17 13:09:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +50,13 @@
</span> static int num_errcodes = 0;
static int num_errcodes_allocated = 0;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-lib_wx_configure.in.diff b/lang/erlang/files/patch-lib_wx_configure.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ac39c7f67be..d91a08b1d14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-lib_wx_configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/files/patch-lib_wx_configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/wx/configure.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/wx/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -545,10 +545,10 @@ AC_CHECK_TYPES([GLintptr, GLintptrARB, GLchar,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/wx/configure.in.orig 2020-09-22 14:11:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/wx/configure.in 2020-11-17 13:09:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -569,10 +569,10 @@
</span> [#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> #endif
])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -563,10 +563,10 @@ AC_TRY_COMPILE([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -587,10 +587,10 @@
</span> #ifdef WIN32
# include <windows.h>
# include <gl/glu.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> #endif
#ifndef CALLBACK
# define CALLBACK
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -613,10 +613,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -637,10 +637,10 @@
</span> #ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-make-configure.diff b/lang/erlang/files/patch-make-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e799dee521b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/files/patch-make-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not check the macOS version. The test is broken on some OS versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and nobody remembers why the check was being done.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/erlang/otp/pull/2871
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make/configure.orig 2020-09-22 14:11:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make/configure 2020-11-17 13:14:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4649,64 +4649,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $CROSS_COMPILING = no; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- macosx_version=`sw_vers -productVersion`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test $? -eq 0 || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "Failed to execute 'sw_vers'; please provide it in PATH" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "$macosx_version" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [1-9][0-9].[0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\10\200|'`;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [1-9][0-9].[0-9].[0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [1-9][0-9].[1-9][0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\1\200|'`;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [1-9][0-9].[1-9][0-9].[0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\20\3|'`;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [1-9][0-9].[1-9][0-9].[1-9][0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int_macosx_version=unexpected;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test $int_macosx_version != unexpected || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "Unexpected MacOSX version ($macosx_version) returned by 'sw_vers -productVersion'; this configure script probably needs to be updated" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > $int_macosx_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error Compiling for a newer MacOSX version...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ac_fn_c_try_compile "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- You are natively building Erlang/OTP for a later version of MacOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- than current version ($macosx_version). You either need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cross-build Erlang/OTP, or set the environment variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET to $macosx_version (or a lower version).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_ext=c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cpp='$CPP $CPPFLAGS'
</span></pre><pre style='margin:0'>
</pre>