CVS commit: pkgsrc/lang/sbcl

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Nov 10 16:58:31 UTC 2019

Modified Files:
        pkgsrc/lang/sbcl: Makefile distinfo
        pkgsrc/lang/sbcl/patches: patch-src_runtime_Config.arm-netbsd
            patch-src_runtime_Config.generic-netbsd
            patch-src_runtime_Config.ppc-netbsd
            patch-src_runtime_Config.sparc-netbsd
Added Files:
        pkgsrc/lang/sbcl/patches: patch-clean.sh
            patch-src_runtime_Config.generic-bsd
            patch-src_runtime_Config.x86-64-bsd
            patch-src_runtime_config.arm-bsd

Log Message:
Re-work the configuration patches a bit.
Verified to build on NetBSD/{macppc,i386,amd64}.
The NetBSD/arm build fails because I can't get lang/clisp to work for it.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/lang/sbcl/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/lang/sbcl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/sbcl/patches/patch-clean.sh \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-bsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-bsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_config.arm-bsd
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/sbcl/Makefile
diff -u pkgsrc/lang/sbcl/Makefile:1.83 pkgsrc/lang/sbcl/Makefile:1.84
--- pkgsrc/lang/sbcl/Makefile:1.83      Sun Nov  3 19:04:07 2019
+++ pkgsrc/lang/sbcl/Makefile   Sun Nov 10 16:58:31 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2019/11/03 19:04:07 rillig Exp $
+# $NetBSD: Makefile,v 1.84 2019/11/10 16:58:31 he Exp $
 
 DISTNAME=              ${PKGNAME_NOREV}-source
 PKGNAME=               sbcl-1.5.7
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sbcl/}
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/lang/sbcl/distinfo
diff -u pkgsrc/lang/sbcl/distinfo:1.63 pkgsrc/lang/sbcl/distinfo:1.64
--- pkgsrc/lang/sbcl/distinfo:1.63      Fri Nov  8 14:42:28 2019
+++ pkgsrc/lang/sbcl/distinfo   Sun Nov 10 16:58:31 2019
@@ -1,20 +1,24 @@
-$NetBSD: distinfo,v 1.63 2019/11/08 14:42:28 he Exp $
+$NetBSD: distinfo,v 1.64 2019/11/10 16:58:31 he Exp $
 
 SHA1 (sbcl-1.5.7-source.tar.bz2) = b16ff3a0c0638bb685ff5f93106553c03a68d978
 RMD160 (sbcl-1.5.7-source.tar.bz2) = 850176b451d83daf52e7b0d2f6095015c5122494
 SHA512 (sbcl-1.5.7-source.tar.bz2) = 8dde1b0d400f93fed085f6b6c33b057c3dec4dfa83afb7431384add6628cb2f910cba006b2579cea547685aeb79fade5ad576b0a42e4f7e1f6c0c3f26acf226e
 Size (sbcl-1.5.7-source.tar.bz2) = 6438048 bytes
 SHA1 (patch-ab) = b087921f7317523fd78396518dfd2cb1c8e6d5f9
+SHA1 (patch-clean.sh) = 8dd795727c2e2cba2c4b5ca8cc4972c89eb6ecaa
 SHA1 (patch-make-genesis-2.sh) = 5d61f2662795c93aabfaa18ef686725d2ed9384a
 SHA1 (patch-make-host-1.sh) = 7ecb23bf3cd4ee091a279503668a539a533b1196
 SHA1 (patch-make-host-2.sh) = c0ac2f16a670a6db2ff69b863d1f990f7ba0bef0
 SHA1 (patch-make-target-1.sh) = 9064623b0cba2fc6869f3d29ea090d55b7bdaf17
 SHA1 (patch-make-target-2.sh) = 7b288c3c320adb89cefa78a2fc93223ea4b3b66f
 SHA1 (patch-slam.sh) = 3edb599272f8f4827b0f5edc5a67d134856ca269
-SHA1 (patch-src_runtime_Config.arm-netbsd) = 4282033c32b3ed533cd64e480827e865deaaa2a2
-SHA1 (patch-src_runtime_Config.generic-netbsd) = 2720f0a9417395751278caa2df7ef9c9c8c9e3e0
-SHA1 (patch-src_runtime_Config.ppc-netbsd) = 39851e2682d9bc4f7770769529dfc3b00664292f
-SHA1 (patch-src_runtime_Config.sparc-netbsd) = 73397cb6e064250f99e91bcd94d84db5d19a523d
+SHA1 (patch-src_runtime_Config.arm-netbsd) = d9ff13f8a6a3909a9ab9f357abde455adee0b645
+SHA1 (patch-src_runtime_Config.generic-bsd) = bafc489a5cb8096e3dd3d3677a83c2907441e8b7
+SHA1 (patch-src_runtime_Config.generic-netbsd) = 8c18ef7660e40851094b0bd6308638b844709fa2
+SHA1 (patch-src_runtime_Config.ppc-netbsd) = 3ecc105ad817badd3a8d0dc44aa0d801714b4917
+SHA1 (patch-src_runtime_Config.sparc-netbsd) = d1825a9b937c5a768b38c267c1924322a83eecdf
+SHA1 (patch-src_runtime_Config.x86-64-bsd) = 4588e0be197de4c4b9f3ef2d449a9a7bf9c38d8d
 SHA1 (patch-src_runtime_Config.x86-64-netbsd) = 79d14015db51f61226b9e848d27f90e2538a84af
 SHA1 (patch-src_runtime_Config.x86-netbsd) = 3875d12349408231d47e55c9d9bb4e77f2709790
+SHA1 (patch-src_runtime_config.arm-bsd) = 1e8f58e93fc276cb4897d19a8b0411457520326e
 SHA1 (patch-src_runtime_run-program.c) = bae41ea7509c70d0c4a0c01097a7a77d1cbd6bf8

Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd:1.1 pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd:1.2
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd:1.1    Sat Oct 12 09:47:40 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd        Sun Nov 10 16:58:31 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_runtime_Config.arm-netbsd,v 1.1 2019/10/12 09:47:40 he Exp $
+$NetBSD: patch-src_runtime_Config.arm-netbsd,v 1.2 2019/11/10 16:58:31 he Exp $
 
 Use Config.generic-netbsd, don't override OS_LIBS, but add to it.
 
 --- src/runtime/Config.arm-netbsd.orig 2019-09-28 09:49:01.000000000 +0000
 +++ src/runtime/Config.arm-netbsd
-@@ -9,10 +9,10 @@
+@@ -9,14 +9,10 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
@@ -13,7 +13,11 @@ Use Config.generic-netbsd, don't overrid
  
 -ASSEM_SRC += ldso-stubs.S
 -OS_LIBS = -lutil -larm
+-
+-ifdef LISP_FEATURE_SB_THREAD
+-  OS_LIBS += -lpthread -lrt
+-endif
 +OS_LIBS += -larm
  
- ifdef LISP_FEATURE_SB_THREAD
-   OS_LIBS += -lpthread -lrt
+ LINKFLAGS += -export-dynamic
+ LDFLAGS += -export-dynamic
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd:1.1 pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd:1.2
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd:1.1        Sat Oct 12 09:47:40 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd    Sun Nov 10 16:58:31 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_runtime_Config.generic-netbsd,v 1.1 2019/10/12 09:47:40 he Exp $
+$NetBSD: patch-src_runtime_Config.generic-netbsd,v 1.2 2019/11/10 16:58:31 he Exp $
 
 Make a Config.generic-netbsd, put common NetBSD settings there.
 
---- src/runtime/Config.generic-netbsd.orig     2019-10-11 22:24:17.425396928 +0000
+--- src/runtime/Config.generic-netbsd.orig     2019-11-08 20:56:21.629373237 +0000
 +++ src/runtime/Config.generic-netbsd
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,22 @@
 +# -*- makefile -*- for the C-level run-time support for SBCL
 +
 +# This software is part of the SBCL system. See the README file for
@@ -16,7 +16,6 @@ Make a Config.generic-netbsd, put common
 +# provided with absolutely no warranty. See the COPYING and CREDITS
 +# files for more information.
 +
-+OS_SRC += bsd-os.c
 +OS_LIBS += -lutil
 +ASSEM_SRC += ldso-stubs.S
 +
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd:1.1 pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd:1.2
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd:1.1    Sat Oct 12 09:47:40 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd        Sun Nov 10 16:58:31 2019
@@ -1,13 +1,14 @@
-$NetBSD: patch-src_runtime_Config.ppc-netbsd,v 1.1 2019/10/12 09:47:40 he Exp $
+$NetBSD: patch-src_runtime_Config.ppc-netbsd,v 1.2 2019/11/10 16:58:31 he Exp $
 
 Use Config.generic-netbsd, don't override OS_LIBS, but add to it.
 
 --- src/runtime/Config.ppc-netbsd.orig 2019-09-28 09:49:01.000000000 +0000
 +++ src/runtime/Config.ppc-netbsd
-@@ -9,17 +9,15 @@
+@@ -9,17 +9,16 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
++include Config.generic-bsd
 +include Config.generic-netbsd
 +
  LINKFLAGS += -dynamic -export-dynamic
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd:1.1 pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd:1.2
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd:1.1  Sat Oct 12 09:47:40 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd      Sun Nov 10 16:58:31 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-src_runtime_Config.sparc-netbsd,v 1.1 2019/10/12 09:47:40 he Exp $
+$NetBSD: patch-src_runtime_Config.sparc-netbsd,v 1.2 2019/11/10 16:58:31 he Exp $
 
-Use Config.generic-netbsd, don't override OS_LIBS, but add to it.
+Use Config.generic-netbsd and Config.generic-bsd,
+don't override OS_LIBS, but add to it.
 
 --- src/runtime/Config.sparc-netbsd.orig       2019-09-28 09:49:01.000000000 +0000
 +++ src/runtime/Config.sparc-netbsd
-@@ -9,19 +9,17 @@
+@@ -9,19 +9,18 @@
  # provided with absolutely no warranty. See the COPYING and CREDITS
  # files for more information.
  
++include Config.generic-bsd
 +include Config.generic-netbsd
 +
  CC = gcc

Added files:

Index: pkgsrc/lang/sbcl/patches/patch-clean.sh
diff -u /dev/null pkgsrc/lang/sbcl/patches/patch-clean.sh:1.1
--- /dev/null   Sun Nov 10 16:58:31 2019
+++ pkgsrc/lang/sbcl/patches/patch-clean.sh     Sun Nov 10 16:58:31 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-clean.sh,v 1.1 2019/11/10 16:58:31 he Exp $
+
+Don't remove original files after patching.
+
+--- clean.sh.orig      2019-09-28 09:49:01.000000000 +0000
++++ clean.sh
+@@ -84,7 +84,6 @@ find . \( \
+         -name '*~' -o \
+         -name '#*#' -o \
+         -name '.#*' -o \
+-        -name '*.orig' -o \
+         -name '.*.orig' -o \
+         -name '*.rej' -o \
+         -name '?*.x86f' -o \
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-bsd
diff -u /dev/null pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-bsd:1.1
--- /dev/null   Sun Nov 10 16:58:31 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-bsd       Sun Nov 10 16:58:31 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_runtime_Config.generic-bsd,v 1.1 2019/11/10 16:58:31 he Exp $
+
+Collect common BSD settings here.
+Add to, not set variables.
+
+--- src/runtime/Config.generic-bsd.orig        2019-11-08 20:59:57.163942965 +0100
++++ src/runtime/Config.generic-bsd     2019-11-08 21:01:16.038801843 +0100
+@@ -0,0 +1,16 @@
++# -*- makefile -*- for the C-level run-time support for SBCL
++
++# This software is part of the SBCL system. See the README file for
++# more information.
++#
++# This software is derived from the CMU CL system, which was
++# written at Carnegie Mellon University and released into the
++# public domain. The software is in the public domain and is
++# provided with absolutely no warranty. See the COPYING and CREDITS
++# files for more information.
++
++OS_SRC += bsd-os.c
++
++ifdef LISP_FEATURE_SB_CORE_COMPRESSION
++  OS_LIBS += -lz
++endif
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-bsd
diff -u /dev/null pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-bsd:1.1
--- /dev/null   Sun Nov 10 16:58:31 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-bsd        Sun Nov 10 16:58:31 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_runtime_Config.x86-64-bsd,v 1.1 2019/11/10 16:58:31 he Exp $
+
+Use newly created Config.generic-bsd.
+Add to, not set variables.
+
+--- src/runtime/Config.x86-64-bsd.orig 2019-09-28 09:49:01.000000000 +0000
++++ src/runtime/Config.x86-64-bsd
+@@ -10,14 +10,12 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-ASSEM_SRC = x86-64-assem.S
+-ARCH_SRC = x86-64-arch.c
++include Config.generic-bsd
+ 
+-OS_SRC = bsd-os.c x86-64-bsd-os.c
+-OS_LIBS = # -ldl
+-ifdef LISP_FEATURE_SB_CORE_COMPRESSION
+-  OS_LIBS += -lz
+-endif
++ASSEM_SRC += x86-64-assem.S
++ARCH_SRC += x86-64-arch.c
++
++OS_SRC += x86-64-bsd-os.c
+ 
+ CFLAGS += -fno-omit-frame-pointer
+ LINKFLAGS += -Wl,--export-dynamic
Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_config.arm-bsd
diff -u /dev/null pkgsrc/lang/sbcl/patches/patch-src_runtime_config.arm-bsd:1.1
--- /dev/null   Sun Nov 10 16:58:31 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_config.arm-bsd   Sun Nov 10 16:58:31 2019
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_runtime_config.arm-bsd,v 1.1 2019/11/10 16:58:31 he Exp $
+
+Use Config.generic-bsd.
+Don't set, but add to common vars.
+
+--- src/runtime/Config.arm-bsd.orig    2019-09-28 09:49:01.000000000 +0000
++++ src/runtime/Config.arm-bsd
+@@ -9,19 +9,18 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
++include Config.generic-bsd
++
+ ASSEM_SRC = arm-assem.S
+ ARCH_SRC = arm-arch.c
+ 
+-OS_SRC = bsd-os.c arm-bsd-os.c
++OS_SRC += arm-bsd-os.c
+ 
+ ifdef LISP_FEATURE_GENCGC
+   GC_SRC = fullcgc.c gencgc.c traceroot.c
+ else
+   GC_SRC = cheneygc.c
+ endif
+-ifdef LISP_FEATURE_SB_CORE_COMPRESSION
+-  OS_LIBS += -lz
+-endif
+ 
+ # Nothing to do for after-grovel-headers.
+ .PHONY: after-grovel-headers