Wed Jan 11 21:58:43 2023 UTC ()
erlang: Fix build on NetBSD


(nikita)
diff -r1.111 -r1.112 pkgsrc/lang/erlang/Makefile
diff -r1.97 -r1.98 pkgsrc/lang/erlang/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/erlang/module.mk
diff -r1.2 -r1.3 pkgsrc/lang/erlang/patches/patch-erts_etc_unix_run__erl.c
diff -r1.2 -r1.3 pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
cvs diff -r1.111 -r1.112 pkgsrc/lang/erlang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/erlang/Makefile 2022/12/27 16:47:52 1.111
+++ pkgsrc/lang/erlang/Makefile 2023/01/11 21:58:42 1.112
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.111 2022/12/27 16:47:52 schmonz Exp $ 1# $NetBSD: Makefile,v 1.112 2023/01/11 21:58:42 nikita Exp $
2 2
3DISTNAME= erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH} 3DISTNAME= erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
4PKGNAME= ${DISTNAME:S/OTP-/erlang-/} 4PKGNAME= ${DISTNAME:S/OTP-/erlang-/}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GITHUB:=erlang/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=erlang/}
7GITHUB_PROJECT= otp 8GITHUB_PROJECT= otp
8GITHUB_TAG= OTP-${PKGVERSION_NOREV} 9GITHUB_TAG= OTP-${PKGVERSION_NOREV}
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.erlang.org/ 12HOMEPAGE= https://www.erlang.org/
12COMMENT= Concurrent functional programming language 13COMMENT= Concurrent functional programming language
13LICENSE= apache-2.0 14LICENSE= apache-2.0
14 15
15EXTRACT_USING= bsdtar 16EXTRACT_USING= bsdtar
16 17
17WRKSRC= ${WRKDIR}/otp-${GITHUB_TAG} 18WRKSRC= ${WRKDIR}/otp-${GITHUB_TAG}
cvs diff -r1.97 -r1.98 pkgsrc/lang/erlang/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/erlang/distinfo 2022/12/27 16:47:52 1.97
+++ pkgsrc/lang/erlang/distinfo 2023/01/11 21:58:42 1.98
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.97 2022/12/27 16:47:52 schmonz Exp $ 1$NetBSD: distinfo,v 1.98 2023/01/11 21:58:42 nikita Exp $
2 2
3BLAKE2s (erlang-25.2.tar.gz) = 11b83e8dcde59029e919dc3d5a036e116c91edc1decb048b4d4b7da90fa18882 3BLAKE2s (erlang-25.2.tar.gz) = 11b83e8dcde59029e919dc3d5a036e116c91edc1decb048b4d4b7da90fa18882
4SHA512 (erlang-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28 4SHA512 (erlang-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28
5Size (erlang-25.2.tar.gz) = 60018819 bytes 5Size (erlang-25.2.tar.gz) = 60018819 bytes
6SHA1 (patch-ab) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f 6SHA1 (patch-ab) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f
7SHA1 (patch-ay) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b 7SHA1 (patch-ay) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b
8SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = dbe72306aac6be0cec09f45869ff077f1bab1e68 8SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = dbe72306aac6be0cec09f45869ff077f1bab1e68
9SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = ee131143c177b2bc1453d94097cbf6b3d3cfb899 9SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = ee131143c177b2bc1453d94097cbf6b3d3cfb899
10SHA1 (patch-erts_etc_unix_run__erl.c) = dbcd6819949874da19daa554335567c444d7abe2 10SHA1 (patch-erts_etc_unix_run__erl.c) = b888aaed44cab4eea87474f7f02adba1f904e033
11SHA1 (patch-erts_lib__src_common_erl__printf.c) = e156722b0617a4a9eb1eb7ea63365cb52ff2e2c9 11SHA1 (patch-erts_lib__src_common_erl__printf.c) = e156722b0617a4a9eb1eb7ea63365cb52ff2e2c9
12SHA1 (patch-lib_crypto_c__src_Makefile.in) = 53eeaba16616816f45e4da525eaf50d35cdd4cde 12SHA1 (patch-lib_crypto_c__src_Makefile.in) = d1f3004e7551231d415fcd240abe13760cfa7277
13SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62 13SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62
cvs diff -r1.4 -r1.5 pkgsrc/lang/erlang/module.mk (expand / switch to unified diff)

--- pkgsrc/lang/erlang/module.mk 2022/10/15 18:04:10 1.4
+++ pkgsrc/lang/erlang/module.mk 2023/01/11 21:58:42 1.5
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: module.mk,v 1.4 2022/10/15 18:04:10 triaxx Exp $ 1# $NetBSD: module.mk,v 1.5 2023/01/11 21:58:42 nikita Exp $
2# 2#
3# Simple Erlang module package framework 3# Simple Erlang module package framework
4# 4#
5 5
6PKGNAME?= erlang-${DISTNAME} 6PKGNAME?= erlang-${DISTNAME}
7 7
8.if defined(REBAR3_BUILD) 8.if defined(REBAR3_BUILD)
9BUILD_DEPENDS+= rebar3-[0-9]*:../../devel/rebar3 9BUILD_DEPENDS+= rebar3-[0-9]*:../../devel/rebar3
10REBAR= ${PREFIX}/bin/rebar3 10REBAR= ${PREFIX}/bin/rebar3
11.else 11.else
12BUILD_DEPENDS+= rebar-[0-9]*:../../devel/rebar 12BUILD_DEPENDS+= rebar-[0-9]*:../../devel/rebar
13.endif 13.endif
14 14
15USE_TOOLS+= gmake pax 15USE_TOOLS+= gmake pax
16 16
 17.include "../../mk/bsd.prefs.mk"
17REBAR?= ${PREFIX}/bin/rebar 18REBAR?= ${PREFIX}/bin/rebar
18MAKE_FLAGS+= REBAR=${REBAR} 19MAKE_FLAGS+= REBAR=${REBAR}
19 20
20# Used by some Erlang packages to use system deps 21# Used by some Erlang packages to use system deps
21MAKE_ENV+= USE_GLOBAL_DEPS=true 22MAKE_ENV+= USE_GLOBAL_DEPS=true
22 23
23ERL_MOD_NAME?= ${DISTNAME:C/-.*//} 24ERL_MOD_NAME?= ${DISTNAME:C/-.*//}
24ERL_MOD_DIR?= lib/erlang/lib/${ERL_MOD_NAME}-${PKGVERSION_NOREV} 25ERL_MOD_DIR?= lib/erlang/lib/${ERL_MOD_NAME}-${PKGVERSION_NOREV}
25INSTALLATION_DIRS+= ${ERL_MOD_DIR} 26INSTALLATION_DIRS+= ${ERL_MOD_DIR}
26 27
27do-install: 28do-install:
28 cd ${WRKSRC} && ${FIND} . \( \ 29 cd ${WRKSRC} && ${FIND} . \( \
29 -name bin -o -name ebin -o -name include -o -name priv \) \ 30 -name bin -o -name ebin -o -name include -o -name priv \) \
cvs diff -r1.2 -r1.3 pkgsrc/lang/erlang/patches/patch-erts_etc_unix_run__erl.c (expand / switch to unified diff)

--- pkgsrc/lang/erlang/patches/patch-erts_etc_unix_run__erl.c 2019/01/03 22:58:36 1.2
+++ pkgsrc/lang/erlang/patches/patch-erts_etc_unix_run__erl.c 2023/01/11 21:58:43 1.3
@@ -1,16 +1,26 @@ @@ -1,16 +1,26 @@
1$NetBSD: patch-erts_etc_unix_run__erl.c,v 1.2 2019/01/03 22:58:36 nia Exp $ 1$NetBSD: patch-erts_etc_unix_run__erl.c,v 1.3 2023/01/11 21:58:43 nikita Exp $
2 2
3Fix SunOS/C99. 3Fix SunOS/C99.
 4Fix NetBSD.
4 5
5--- erts/etc/unix/run_erl.c.orig 2018-12-10 20:11:00.000000000 +0000 6--- erts/etc/unix/run_erl.c.orig 2022-12-12 08:30:54.000000000 +0100
6+++ erts/etc/unix/run_erl.c 7+++ erts/etc/unix/run_erl.c 2023-01-11 22:30:49.938119650 +0100
7@@ -41,6 +41,9 @@ 8@@ -41,6 +41,9 @@
8 #ifdef HAVE_CONFIG_H 9 #ifdef HAVE_CONFIG_H
9 # include "config.h" 10 # include "config.h"
10 #endif 11 #endif
11+#ifdef __sun 12+#ifdef __sun
12+#define __EXTENSIONS__ 13+#define __EXTENSIONS__
13+#endif 14+#endif
14 #ifdef HAVE_WORKING_POSIX_OPENPT 15 #ifdef HAVE_WORKING_POSIX_OPENPT
15 # ifndef _XOPEN_SOURCE 16 # ifndef _XOPEN_SOURCE
16 /* On OS X, BSD and Solaris, we must leave _XOPEN_SOURCE undefined in order 17 /* On OS X, BSD and Solaris, we must leave _XOPEN_SOURCE undefined in order
 18@@ -81,7 +84,7 @@
 19 #ifdef HAVE_LIBUTIL_H
 20 # include <libutil.h>
 21 #endif
 22-#ifdef HAVE_UTIL_H
 23+#if defined(HAVE_UTIL_H) || defined(__NetBSD__)
 24 # include <util.h>
 25 #endif
 26 #ifdef HAVE_SYS_IOCTL_H
cvs diff -r1.2 -r1.3 pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in 2022/10/15 18:04:10 1.2
+++ pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in 2023/01/11 21:58:43 1.3
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.2 2022/10/15 18:04:10 triaxx Exp $ 1$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.3 2023/01/11 21:58:43 nikita Exp $
2 2
3Compile via CC wrapper to ensure correct flags. 3Compile via CC wrapper to ensure correct flags.
4 4
5--- lib/crypto/c_src/Makefile.in.orig 2022-09-20 10:30:35.000000000 +0000 5--- lib/crypto/c_src/Makefile.in.orig 2022-12-12 08:30:54.000000000 +0100
6+++ lib/crypto/c_src/Makefile.in 6+++ lib/crypto/c_src/Makefile.in 2023-01-11 22:23:39.931423171 +0100
7@@ -232,7 +232,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY 7@@ -147,7 +147,7 @@
 8 endif
 9
 10 ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
 11-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
 12+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
 13 CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
 14 EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
 15 else
 16@@ -232,7 +232,7 @@
8 ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) 17 ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
9 $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS) 18 $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
10 $(INSTALL_DIR) $(LIBDIR) 19 $(INSTALL_DIR) $(LIBDIR)
11- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) 20- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
12+ $(V_CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) 21+ $(V_CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
13  22
14 $(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS) 23 $(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS)
15 $(INSTALL_DIR) $(LIBDIR) 24 $(INSTALL_DIR) $(LIBDIR)