Mon Jan 8 10:39:45 2018 UTC ()
guile22: fix build on NetBSD 8+


(wiz)
diff -r1.5 -r1.6 pkgsrc/lang/guile22/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/guile22/distinfo
diff -r0 -r1.1 pkgsrc/lang/guile22/patches/patch-libguile_Makefile.in
cvs diff -r1.5 -r1.6 pkgsrc/lang/guile22/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile22/Makefile 2017/12/02 18:34:04 1.5
+++ pkgsrc/lang/guile22/Makefile 2018/01/08 10:39:45 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2017/12/02 18:34:04 gdt Exp $ 1# $NetBSD: Makefile,v 1.6 2018/01/08 10:39:45 wiz Exp $
2 2
3DISTNAME= guile-2.2.3 3DISTNAME= guile-2.2.3
4PKGNAME= ${DISTNAME:S/guile/guile22/} 4PKGNAME= ${DISTNAME:S/guile/guile22/}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnu.org/software/guile/ 10HOMEPAGE= https://www.gnu.org/software/guile/
10COMMENT= Official extension language for the GNU operating system 11COMMENT= Official extension language for the GNU operating system
11LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
12 13
13# Currently, 2.0 is primary. 14# Currently, 2.0 is primary.
14GUILE_SUBDIR= guile/2.2 15GUILE_SUBDIR= guile/2.2
15#GUILE_SUBDIR= # empty 16#GUILE_SUBDIR= # empty
16 17
17# guile does not like the --build and --host triplets on NetBSD 18# guile does not like the --build and --host triplets on NetBSD
cvs diff -r1.2 -r1.3 pkgsrc/lang/guile22/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/guile22/distinfo 2017/12/02 18:34:04 1.2
+++ pkgsrc/lang/guile22/distinfo 2018/01/08 10:39:45 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2017/12/02 18:34:04 gdt Exp $ 1$NetBSD: distinfo,v 1.3 2018/01/08 10:39:45 wiz Exp $
2 2
3SHA1 (guile-2.2.3.tar.gz) = b80fac5002e8725b59fb65a8b049ff6337d045c9 3SHA1 (guile-2.2.3.tar.gz) = b80fac5002e8725b59fb65a8b049ff6337d045c9
4RMD160 (guile-2.2.3.tar.gz) = 62d71904c228adc4fda0bfc752bf7a01f69c5663 4RMD160 (guile-2.2.3.tar.gz) = 62d71904c228adc4fda0bfc752bf7a01f69c5663
5SHA512 (guile-2.2.3.tar.gz) = 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd 5SHA512 (guile-2.2.3.tar.gz) = 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
6Size (guile-2.2.3.tar.gz) = 17266587 bytes 6Size (guile-2.2.3.tar.gz) = 17266587 bytes
 7SHA1 (patch-libguile_Makefile.in) = d948162124a4263d3185fe1bcf8e90f4930d161c
File Added: pkgsrc/lang/guile22/patches/Attic/patch-libguile_Makefile.in
$NetBSD: patch-libguile_Makefile.in,v 1.1 2018/01/08 10:39:45 wiz Exp $

Fix build on NetBSD>=8.

--- libguile/Makefile.in.orig	2017-11-06 09:12:56.000000000 +0000
+++ libguile/Makefile.in
@@ -2444,6 +2444,8 @@ clean-noinstPROGRAMS:
 guile$(EXEEXT): $(guile_OBJECTS) $(guile_DEPENDENCIES) $(EXTRA_guile_DEPENDENCIES) 
 	@rm -f guile$(EXEEXT)
 	$(AM_V_CCLD)$(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS)
+	if [ `uname -s` = "NetBSD" ]; then paxctl +m .libs/guile$(EXEEXT); fi
+
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \