Sat Nov 2 17:02:56 2019 UTC ()
lang/clisp: fix build failure on macOS


(rillig)
diff -r1.1 -r1.2 pkgsrc/lang/clisp/buildlink3.mk
diff -r1.36 -r1.37 pkgsrc/lang/clisp/distinfo
diff -r1.19 -r1.20 pkgsrc/lang/clisp/patches/patch-aa
cvs diff -r1.1 -r1.2 pkgsrc/lang/clisp/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/clisp/buildlink3.mk 2010/07/09 18:08:05 1.1
+++ pkgsrc/lang/clisp/buildlink3.mk 2019/11/02 17:02:56 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.1 2010/07/09 18:08:05 asau Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 17:02:56 rillig Exp $
2 2#
3# BUILDLINK_DEPMETHOD.clisp?= build # -- not checked yet 3# BUILDLINK_DEPMETHOD.clisp?= build # -- not checked yet
4 4
5BUILDLINK_TREE+= clisp 5BUILDLINK_TREE+= clisp
6 6
7.if !defined(CLISP_BUILDLINK3_MK) 7.if !defined(CLISP_BUILDLINK3_MK)
8CLISP_BUILDLINK3_MK:= 8CLISP_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.clisp+= clisp>=2.49 10BUILDLINK_API_DEPENDS.clisp+= clisp>=2.49
11BUILDLINK_PKGSRCDIR.clisp?= ../../lang/clisp 11BUILDLINK_PKGSRCDIR.clisp?= ../../lang/clisp
12 12
13.endif # CLISP_BUILDLINK3_MK 13.endif # CLISP_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -clisp 15BUILDLINK_TREE+= -clisp
cvs diff -r1.36 -r1.37 pkgsrc/lang/clisp/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/clisp/distinfo 2018/01/29 17:38:23 1.36
+++ pkgsrc/lang/clisp/distinfo 2019/11/02 17:02:56 1.37
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.36 2018/01/29 17:38:23 jperkin Exp $ 1$NetBSD: distinfo,v 1.37 2019/11/02 17:02:56 rillig Exp $
2 2
3SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323 3SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
4RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76 4RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
5SHA512 (clisp-2.49.tar.gz) = 7885956b373a4c1d04a0b43c229fe8c8694d89982cadce09da6ef03cb56a5705b92f94b564981075c36bb9773a9f16b0b95fef23e942f6245604aefa6600ef98 5SHA512 (clisp-2.49.tar.gz) = 7885956b373a4c1d04a0b43c229fe8c8694d89982cadce09da6ef03cb56a5705b92f94b564981075c36bb9773a9f16b0b95fef23e942f6245604aefa6600ef98
6Size (clisp-2.49.tar.gz) = 9823111 bytes 6Size (clisp-2.49.tar.gz) = 9823111 bytes
7SHA1 (patch-aa) = aa7e25685ed5818f45b550eba0011683dc36bc90 7SHA1 (patch-aa) = 65938825a9d219ddf93f09b306feb857bd83e0b6
8SHA1 (patch-ab) = 93aef2c423ce9e5eabebc20cdc144c83845b19cb 8SHA1 (patch-ab) = 93aef2c423ce9e5eabebc20cdc144c83845b19cb
9SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b 9SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b
10SHA1 (patch-modules_readline_readline.lisp) = 1463cb15f6a21374dffc0e585670ac89bb758ff3 10SHA1 (patch-modules_readline_readline.lisp) = 1463cb15f6a21374dffc0e585670ac89bb758ff3
11SHA1 (patch-src_configure) = 861681456cb768b7f308aa88e77f1cee1edb2090 11SHA1 (patch-src_configure) = 861681456cb768b7f308aa88e77f1cee1edb2090
12SHA1 (patch-src_intparam.c) = f968079252691d06e191cf991bd43eea0a0bc739 12SHA1 (patch-src_intparam.c) = f968079252691d06e191cf991bd43eea0a0bc739
13SHA1 (patch-src_lispbibl.d) = 68eeac6def2d22ffb214fd8be3870d5c654f10bc 13SHA1 (patch-src_lispbibl.d) = 68eeac6def2d22ffb214fd8be3870d5c654f10bc
14SHA1 (patch-src_stream.d) = 28bde27e99277d9df24028534c3b46e2099c460c 14SHA1 (patch-src_stream.d) = 28bde27e99277d9df24028534c3b46e2099c460c
15SHA1 (patch-src_unix.d) = 7158a2a18fd0f3a524658896b9b0abc98286c01e 15SHA1 (patch-src_unix.d) = 7158a2a18fd0f3a524658896b9b0abc98286c01e
cvs diff -r1.19 -r1.20 pkgsrc/lang/clisp/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/clisp/patches/patch-aa 2014/05/14 11:24:25 1.19
+++ pkgsrc/lang/clisp/patches/patch-aa 2019/11/02 17:02:56 1.20
@@ -1,22 +1,36 @@ @@ -1,22 +1,36 @@
1$NetBSD: patch-aa,v 1.19 2014/05/14 11:24:25 jperkin Exp $ 1$NetBSD: patch-aa,v 1.20 2019/11/02 17:02:56 rillig Exp $
2 2
3Override library subdirectory name for consistency. 3Override library subdirectory name for consistency.
4Don't use cache file to avoid trailing space problem. 4Don't use cache file to avoid trailing space problem.
5Support staged installation of modules. 5Support staged installation of modules.
6Fix SunOS linking. 6Fix SunOS linking.
7 7
 8https://mail-index.netbsd.org/pkgsrc-users/2019/11/02/msg029846.html
 9https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure)
 10
8--- src/makemake.in.orig 2010-07-07 15:15:35.000000000 +0000 11--- src/makemake.in.orig 2010-07-07 15:15:35.000000000 +0000
9+++ src/makemake.in 12+++ src/makemake.in
 13@@ -577,8 +577,8 @@
 14 CROSS=false
 15 if [ -z "$HSYS" ]; then # not win32gcc
 16 # some shells (A/UX and OSF/1) need the parentheses around "arch" below.
 17- HSYS=`((arch) 2>/dev/null || uname -m 2>/dev/null) | $tolower` # system name in lowercase
 18- HSYSOS=`((uname) 2>/dev/null || arch 2>/dev/null) | $tolower` # OS name in lowercase
 19+ HSYS=`( (arch) 2>/dev/null || uname -m 2>/dev/null) | $tolower` # system name in lowercase
 20+ HSYSOS=`( (uname) 2>/dev/null || arch 2>/dev/null) | $tolower` # OS name in lowercase
 21 if [ "$HSYS" = 386bsd -o "$HSYS" = sun386 -o "$HSYS" = "386/at" -o "$HSYS" = i86pc ] ; then
 22 HSYS='i386'
 23 fi
10@@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ]; 24@@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ];
11 XCC_PICFLAG='' 25 XCC_PICFLAG=''
12 ;; 26 ;;
13 esac 27 esac
14- XCC_CREATESHARED='create-shared-lib -o $lib $libs' # dummy command 28- XCC_CREATESHARED='create-shared-lib -o $lib $libs' # dummy command
15+ XCC_CREATESHARED='create-shared-lib -o "${DESTDIR}$lib" $libs' # dummy command 29+ XCC_CREATESHARED='create-shared-lib -o "${DESTDIR}$lib" $libs' # dummy command
16 case "$host_os" in 30 case "$host_os" in
17 freebsd2.2*) 31 freebsd2.2*)
18- XCC_CREATESHARED='ld -Bshareable -o $lib $libs /usr/lib/c++rt0.o' 32- XCC_CREATESHARED='ld -Bshareable -o $lib $libs /usr/lib/c++rt0.o'
19+ XCC_CREATESHARED='ld -Bshareable -o "${DESTDIR}$lib" $libs /usr/lib/c++rt0.o' 33+ XCC_CREATESHARED='ld -Bshareable -o "${DESTDIR}$lib" $libs /usr/lib/c++rt0.o'
20 ;; 34 ;;
21 freebsd2* | netbsd* | openbsd*) 35 freebsd2* | netbsd* | openbsd*)
22- XCC_CREATESHARED='ld -Bshareable -o $lib $libs' 36- XCC_CREATESHARED='ld -Bshareable -o $lib $libs'