CVS commit: pkgsrc/lang/erlang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 22 09:20:31 UTC 2023

Modified Files:
        pkgsrc/lang/erlang: Makefile distinfo
Removed Files:
        pkgsrc/lang/erlang/patches: patch-erts_emulator_Makefile.in

Log Message:
erlang: disable jit instead of using paxctl workaround

Suggested by upstream.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/lang/erlang/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.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/Makefile
diff -u pkgsrc/lang/erlang/Makefile:1.114 pkgsrc/lang/erlang/Makefile:1.115
--- pkgsrc/lang/erlang/Makefile:1.114   Tue Feb 21 10:29:16 2023
+++ pkgsrc/lang/erlang/Makefile Wed Feb 22 09:20:31 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2023/02/21 10:29:16 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2023/02/22 09:20:31 wiz Exp $
 
 DISTNAME=      erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=       ${DISTNAME:S/OTP-/erlang-/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=        otp
@@ -30,10 +30,6 @@ MKPIE_SUPPORTED=     no
 MAKE_FLAGS+=   ARCH=arm
 .endif
 
-# Coordinate with Makefile patches.
-MAKE_ENV+=             PAXCTL=echo
-MAKE_ENV.NetBSD+=      PAXCTL=/usr/sbin/paxctl
-
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 USE_GNU_CONFIGURE_HOST=        yes
 .else
@@ -45,6 +41,8 @@ CONFIGURE_ARGS+=      --with-ssl=${BUILDLINK_
 
 PTHREAD_OPTS+=         require native
 CONFIGURE_ARGS+=       --enable-threads
+# https://github.com/erlang/otp/issues/6909
+CONFIGURE_ARGS.NetBSD+=        --disable-jit
 
 MAKE_ENV+=             DESTDIR=${DESTDIR}
 

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.100 pkgsrc/lang/erlang/distinfo:1.101
--- pkgsrc/lang/erlang/distinfo:1.100   Tue Feb 21 12:18:06 2023
+++ pkgsrc/lang/erlang/distinfo Wed Feb 22 09:20:31 2023
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.100 2023/02/21 12:18:06 wiz Exp $
+$NetBSD: distinfo,v 1.101 2023/02/22 09:20:31 wiz Exp $
 
 BLAKE2s (erlang-25.2.tar.gz) = 11b83e8dcde59029e919dc3d5a036e116c91edc1decb048b4d4b7da90fa18882
 SHA512 (erlang-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28
 Size (erlang-25.2.tar.gz) = 60018819 bytes
 SHA1 (patch-ab) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f
 SHA1 (patch-ay) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b
-SHA1 (patch-erts_emulator_Makefile.in) = c11564834cbaddce3e754c4350353ab9d843fab6
 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) = b888aaed44cab4eea87474f7f02adba1f904e033