CVS commit: pkgsrc/lang/sbcl

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

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Nov  8 14:42:28 UTC 2019

Modified Files:
        pkgsrc/lang/sbcl: distinfo
        pkgsrc/lang/sbcl/patches: patch-src_runtime_Config.x86-netbsd

Log Message:
Update the patch to src/runtime/Config.x86-netbsd so that this
builds again on NetBSD/i386.  Build fix so no revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/lang/sbcl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-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/distinfo
diff -u pkgsrc/lang/sbcl/distinfo:1.62 pkgsrc/lang/sbcl/distinfo:1.63
--- pkgsrc/lang/sbcl/distinfo:1.62      Fri Nov  8 09:53:43 2019
+++ pkgsrc/lang/sbcl/distinfo   Fri Nov  8 14:42:28 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2019/11/08 09:53:43 he Exp $
+$NetBSD: distinfo,v 1.63 2019/11/08 14:42:28 he Exp $
 
 SHA1 (sbcl-1.5.7-source.tar.bz2) = b16ff3a0c0638bb685ff5f93106553c03a68d978
 RMD160 (sbcl-1.5.7-source.tar.bz2) = 850176b451d83daf52e7b0d2f6095015c5122494
@@ -16,5 +16,5 @@ SHA1 (patch-src_runtime_Config.generic-n
 SHA1 (patch-src_runtime_Config.ppc-netbsd) = 39851e2682d9bc4f7770769529dfc3b00664292f
 SHA1 (patch-src_runtime_Config.sparc-netbsd) = 73397cb6e064250f99e91bcd94d84db5d19a523d
 SHA1 (patch-src_runtime_Config.x86-64-netbsd) = 79d14015db51f61226b9e848d27f90e2538a84af
-SHA1 (patch-src_runtime_Config.x86-netbsd) = 019c69d928d5ed80a2b4862a82008f50465eeda7
+SHA1 (patch-src_runtime_Config.x86-netbsd) = 3875d12349408231d47e55c9d9bb4e77f2709790
 SHA1 (patch-src_runtime_run-program.c) = bae41ea7509c70d0c4a0c01097a7a77d1cbd6bf8

Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd:1.1 pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd:1.2
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd:1.1    Sat Oct 12 09:47:40 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd        Fri Nov  8 14:42:28 2019
@@ -1,17 +1,18 @@
-$NetBSD: patch-src_runtime_Config.x86-netbsd,v 1.1 2019/10/12 09:47:40 he Exp $
+$NetBSD: patch-src_runtime_Config.x86-netbsd,v 1.2 2019/11/08 14:42:28 he Exp $
 
-Use Config.generic-netbsd.
+Use Config.generic-netbsd and override OS_SRC
+because Config.x86-bsd should be split into Config.x86-bsd and Config.bsd...
 
 --- src/runtime/Config.x86-netbsd.orig 2019-09-28 09:49:01.000000000 +0000
 +++ src/runtime/Config.x86-netbsd
-@@ -9,10 +9,11 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
+@@ -10,9 +10,11 @@
  # files for more information.
  
-+include Config.generic-netbsd
  include Config.x86-bsd
++include Config.generic-netbsd
  
 -ASSEM_SRC += ldso-stubs.S
++OS_SRC = bsd-os.c x86-bsd-os.c
  OS_SRC += undefineds.c
 +
  LINKFLAGS += -dynamic -export-dynamic