CVS commit: pkgsrc/lang/erlang

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 21 10:20:01 UTC 2023

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

Log Message:
erlang: fix build on NetBSD with PaX enabled.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/lang/erlang/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.112 pkgsrc/lang/erlang/Makefile:1.113
--- pkgsrc/lang/erlang/Makefile:1.112   Wed Jan 11 21:58:42 2023
+++ pkgsrc/lang/erlang/Makefile Tue Feb 21 10:20:01 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2023/01/11 21:58:42 nikita Exp $
+# $NetBSD: Makefile,v 1.113 2023/02/21 10:20:01 wiz Exp $
 
 DISTNAME=      erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=       ${DISTNAME:S/OTP-/erlang-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=        otp
@@ -30,6 +30,10 @@ 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

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.98 pkgsrc/lang/erlang/distinfo:1.99
--- pkgsrc/lang/erlang/distinfo:1.98    Wed Jan 11 21:58:42 2023
+++ pkgsrc/lang/erlang/distinfo Tue Feb 21 10:20:01 2023
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.98 2023/01/11 21:58:42 nikita Exp $
+$NetBSD: distinfo,v 1.99 2023/02/21 10:20:01 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) = 42c049705853fc41cb18693d4129fb79cc22d386
 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

Added files:

Index: pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in:1.1
--- /dev/null   Tue Feb 21 10:20:01 2023
+++ pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in  Tue Feb 21 10:20:01 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-erts_emulator_Makefile.in,v 1.1 2023/02/21 10:20:01 wiz Exp $
+
+Mark as not PaX safe (due to JIT code) on NetBSD.
+See pkgsrc Makefile for setting of PAXCTL variable.
+
+--- erts/emulator/Makefile.in.orig     2022-12-12 07:30:54.000000000 +0000
++++ erts/emulator/Makefile.in
+@@ -1254,6 +1254,7 @@ $(BINDIR)/$(FLAVOR_EXECUTABLE): $(INIT_O
+       $(ld_verbose) $(EMU_LD) -o $@ \
+       $(PROFILE_LDFLAGS) $(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS) \
+       $(STATIC_NIF_LIBS) $(STATIC_DRIVER_LIBS) $(LIBS)
++      $(PAXCTL) +m $@
+ 
+ endif
+