CVS commit: pkgsrc/lang/guile30

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar  4 09:41:14 UTC 2023

Modified Files:
        pkgsrc/lang/guile30: Makefile distinfo
Removed Files:
        pkgsrc/lang/guile30/patches: patch-libguile_Makefile.in
            patch-test-suite_standalone_Makefile.in

Log Message:
guile30: remove paxctl workaround for JIT on NetBSD

Just disable JIT and wait for a proper upstream fix.
Bug report filed at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61957

Test status on NetBSD has not changed.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/guile30/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/guile30/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/guile30/patches/patch-libguile_Makefile.in \
    pkgsrc/lang/guile30/patches/patch-test-suite_standalone_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/guile30/Makefile
diff -u pkgsrc/lang/guile30/Makefile:1.7 pkgsrc/lang/guile30/Makefile:1.8
--- pkgsrc/lang/guile30/Makefile:1.7    Wed Jan 25 18:12:00 2023
+++ pkgsrc/lang/guile30/Makefile        Sat Mar  4 09:41:13 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2023/01/25 18:12:00 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2023/03/04 09:41:13 wiz Exp $
 
-VERSION=       3.0.9
-DISTNAME=      guile-${VERSION}
+DISTNAME=      guile-3.0.9
 PKGNAME=       ${DISTNAME:S/guile/guile30/}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.gnu.org/gnu/guile/
 
@@ -24,11 +24,9 @@ LDFLAGS.SunOS+=              -lsocket -lnsl
 # Fails with ranlib complaints; disable for all until understood.
 CONFIGURE_ARGS+=       --disable-lto
 
-# Coordinate with Makefile patches.
-MAKE_ENV+=             PAXCTL=echo
-MAKE_ENV.NetBSD+=      PAXCTL=/usr/sbin/paxctl
-
-CONFIGURE_ARGS+=       --disable-lto
+# JIT doesn't work on NetBSD due to PaX MPROTECT
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61957
+CONFIGURE_ARGS.NetBSD+=        --disable-jit
 
 .if !empty(GUILE_SUBDIR)
 # Installation prefix is non-default.

Index: pkgsrc/lang/guile30/distinfo
diff -u pkgsrc/lang/guile30/distinfo:1.3 pkgsrc/lang/guile30/distinfo:1.4
--- pkgsrc/lang/guile30/distinfo:1.3    Wed Jan 25 18:12:00 2023
+++ pkgsrc/lang/guile30/distinfo        Sat Mar  4 09:41:13 2023
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2023/01/25 18:12:00 gdt Exp $
+$NetBSD: distinfo,v 1.4 2023/03/04 09:41:13 wiz Exp $
 
 BLAKE2s (guile-3.0.9.tar.gz) = 0b58897075659445a370db20baab6c90c284bd27f897e269498977fcbf686543
 SHA512 (guile-3.0.9.tar.gz) = 6fd14f0860c7f5b7a9b53c43a60c6a7ca53072684ddc818cd10c720af2c5761ef110b29af466b89ded884fb66d66060894b14e615eaebee8844c397932d05fa2
 Size (guile-3.0.9.tar.gz) = 9734735 bytes
-SHA1 (patch-libguile_Makefile.in) = eae49ebd5b2a4a415be89503819f454b7eb6a21d
 SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1
-SHA1 (patch-test-suite_standalone_Makefile.in) = d1f0b24adcb7db4b1d6f91e2e55d4a9c245700e6