CVS commit: pkgsrc/lang/erlang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec  3 16:57:05 UTC 2020

Modified Files:
        pkgsrc/lang/erlang: distinfo
Added Files:
        pkgsrc/lang/erlang/patches: patch-erts_emulator_sys_common_erl__poll.c
            patch-make_configure.in

Log Message:
erlang: fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/lang/erlang/patches/patch-erts_emulator_sys_common_erl__poll.c
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/erlang/patches/patch-make_configure.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.80 pkgsrc/lang/erlang/distinfo:1.81
--- pkgsrc/lang/erlang/distinfo:1.80    Fri Mar 20 16:05:34 2020
+++ pkgsrc/lang/erlang/distinfo Thu Dec  3 16:57:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2020/03/20 16:05:34 nia Exp $
+$NetBSD: distinfo,v 1.81 2020/12/03 16:57:04 adam Exp $
 
 SHA1 (erlang-22.2.8.tar.gz) = ea13d421086ede18d7de88c871d4b0d35b89c415
 RMD160 (erlang-22.2.8.tar.gz) = 21b8f03a3076364118e24f96b257b656b081d455
@@ -9,9 +9,11 @@ SHA1 (patch-ay) = f5f1accdb11e404ba4779b
 SHA1 (patch-erts_aclocal.m4) = 3812a0feda06eb7c6ff02b5ac7125284ad5df2cb
 SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = e34674aea2fa5092b5215944cb5639738df647bb
 SHA1 (patch-erts_emulator_nifs_common_prim__net__nif.c) = 39a3c134f17ede852a736494f035c8ce01b0ed4b
+SHA1 (patch-erts_emulator_sys_common_erl__poll.c) = dac6a41d96b1c6b2ca8a0b2511275db4ac90689c
 SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = a165f977221acc8aba2ef30ca23d149a10af060a
 SHA1 (patch-erts_etc_unix_run__erl.c) = dbcd6819949874da19daa554335567c444d7abe2
 SHA1 (patch-erts_lib__src_common_erl__printf.c) = 31ab5c501d62f021e7570a925dcc75d38605ae41
 SHA1 (patch-lib_crypto_c__src_Makefile.in) = 0ab1db36c03999524e933d60f913ff5608b0622e
 SHA1 (patch-lib_tools_c__src_Makefile.in) = 4fa1ef2ace4fc64efdb6b3acd24decf031ae778d
+SHA1 (patch-make_configure.in) = 1eedad3b26f6070e2b0a0fba06e850c796885932
 SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62

Added files:

Index: pkgsrc/lang/erlang/patches/patch-erts_emulator_sys_common_erl__poll.c
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-erts_emulator_sys_common_erl__poll.c:1.5
--- /dev/null   Thu Dec  3 16:57:05 2020
+++ pkgsrc/lang/erlang/patches/patch-erts_emulator_sys_common_erl__poll.c       Thu Dec  3 16:57:05 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-erts_emulator_sys_common_erl__poll.c,v 1.5 2020/12/03 16:57:05 adam Exp $
+
+Fix for systems where max_fds is a large number (e.g. Darwin).
+
+--- erts/emulator/sys/common/erl_poll.c.orig   2020-12-03 15:45:53.000000000 +0000
++++ erts/emulator/sys/common/erl_poll.c
+@@ -312,7 +312,7 @@ struct ERTS_POLL_EXPORT(erts_pollset) {
+ void erts_silence_warn_unused_result(long unused);
+ static void fatal_error(char *format, ...);
+ 
+-static int max_fds = -1;
++static long max_fds = -1;
+ 
+ #if ERTS_POLL_USE_POLL
+ 

Index: pkgsrc/lang/erlang/patches/patch-make_configure.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-make_configure.in:1.1
--- /dev/null   Thu Dec  3 16:57:05 2020
+++ pkgsrc/lang/erlang/patches/patch-make_configure.in  Thu Dec  3 16:57:05 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-make_configure.in,v 1.1 2020/12/03 16:57:05 adam Exp $
+
+--- make/configure.in.orig     2020-12-03 16:05:35.000000000 +0000
++++ make/configure.in
+@@ -392,7 +392,7 @@ if test $CROSS_COMPILING = no; then
+          }
+          [case "$macosx_version" in
+              [1-9][0-9].[0-9])
+-                int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\1\2|'`;;
++                  int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\10\200|'`;;
+              [1-9][0-9].[0-9].[0-9])
+                 int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
+              [1-9][0-9].[1-9][0-9])