kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

erlang: Fix build on NetBSD

Browse source
This commit is contained in:
nikita 2023-01-11 21:58:42 +00:00
parent 299b4f17f2
commit 4c9bccb7de
5 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lang/erlang/Makefile
View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.111 2022/12/27 16:47:52 schmonz Exp $
# $NetBSD: Makefile,v 1.112 2023/01/11 21:58:42 nikita Exp $
DISTNAME= erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
PKGNAME= ${DISTNAME:S/OTP-/erlang-/}
PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=erlang/}
GITHUB_PROJECT= otp

6
lang/erlang/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.97 2022/12/27 16:47:52 schmonz Exp $
$NetBSD: distinfo,v 1.98 2023/01/11 21:58:42 nikita Exp $
BLAKE2s (erlang-25.2.tar.gz) = 11b83e8dcde59029e919dc3d5a036e116c91edc1decb048b4d4b7da90fa18882
SHA512 (erlang-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28
@ -7,7 +7,7 @@ SHA1 (patch-ab) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f
SHA1 (patch-ay) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b
SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = dbe72306aac6be0cec09f45869ff077f1bab1e68
SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = ee131143c177b2bc1453d94097cbf6b3d3cfb899
SHA1 (patch-erts_etc_unix_run__erl.c) = dbcd6819949874da19daa554335567c444d7abe2
SHA1 (patch-erts_etc_unix_run__erl.c) = b888aaed44cab4eea87474f7f02adba1f904e033
SHA1 (patch-erts_lib__src_common_erl__printf.c) = e156722b0617a4a9eb1eb7ea63365cb52ff2e2c9
SHA1 (patch-lib_crypto_c__src_Makefile.in) = 53eeaba16616816f45e4da525eaf50d35cdd4cde
SHA1 (patch-lib_crypto_c__src_Makefile.in) = d1f3004e7551231d415fcd240abe13760cfa7277
SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62

3
lang/erlang/module.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: module.mk,v 1.4 2022/10/15 18:04:10 triaxx Exp $
# $NetBSD: module.mk,v 1.5 2023/01/11 21:58:42 nikita Exp $
#
# Simple Erlang module package framework
#
@ -14,6 +14,7 @@ BUILD_DEPENDS+= rebar-[0-9]*:../../devel/rebar
USE_TOOLS+= gmake pax
.include "../../mk/bsd.prefs.mk"
REBAR?= ${PREFIX}/bin/rebar
MAKE_FLAGS+= REBAR=${REBAR}

16
lang/erlang/patches/patch-erts_etc_unix_run__erl.c
View file

@ -1,9 +1,10 @@
$NetBSD: patch-erts_etc_unix_run__erl.c,v 1.2 2019/01/03 22:58:36 nia Exp $
$NetBSD: patch-erts_etc_unix_run__erl.c,v 1.3 2023/01/11 21:58:43 nikita Exp $
Fix SunOS/C99.
Fix NetBSD.
--- erts/etc/unix/run_erl.c.orig 2018-12-10 20:11:00.000000000 +0000
+++ erts/etc/unix/run_erl.c
--- erts/etc/unix/run_erl.c.orig 2022-12-12 08:30:54.000000000 +0100
+++ erts/etc/unix/run_erl.c 2023-01-11 22:30:49.938119650 +0100
@@ -41,6 +41,9 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
@ -14,3 +15,12 @@ Fix SunOS/C99.
#ifdef HAVE_WORKING_POSIX_OPENPT
# ifndef _XOPEN_SOURCE
/* On OS X, BSD and Solaris, we must leave _XOPEN_SOURCE undefined in order
@@ -81,7 +84,7 @@
#ifdef HAVE_LIBUTIL_H
# include <libutil.h>
#endif
-#ifdef HAVE_UTIL_H
+#if defined(HAVE_UTIL_H) || defined(__NetBSD__)
# include <util.h>
#endif
#ifdef HAVE_SYS_IOCTL_H

17
lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
View file

@ -1,10 +1,19 @@
$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.2 2022/10/15 18:04:10 triaxx Exp $
$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.3 2023/01/11 21:58:43 nikita Exp $
Compile via CC wrapper to ensure correct flags.
--- lib/crypto/c_src/Makefile.in.orig 2022-09-20 10:30:35.000000000 +0000
+++ lib/crypto/c_src/Makefile.in
@@ -232,7 +232,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY
--- lib/crypto/c_src/Makefile.in.orig 2022-12-12 08:30:54.000000000 +0100
+++ lib/crypto/c_src/Makefile.in 2023-01-11 22:23:39.931423171 +0100
@@ -147,7 +147,7 @@
endif
ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else
@@ -232,7 +232,7 @@
ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
$(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
$(INSTALL_DIR) $(LIBDIR)