dev-lisp/sbcl-9999: update build system patch to HEAD

3 files changed, 14 insertions, 33 deletions

diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 47e82ad2..aff5a269 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,6 +1,5 @@
 AUX 1.0.43-gentoo-fix_build_system.patch 19475 RMD160 8720868ee6fe4586a0b686cb2dc329a1440e9997 SHA1 787434581e9936d62a3df67f90f34a9ebff1efbd SHA256 0eeaa40b70d6750e1d0e0d090fed85a973b8b45df2f8be967c80ecd41ad8da54
-AUX 9999-gentoo-fix_build_system.patch 19374 RMD160 99d779a73f57d339d9f3f031eb27f481f8b76ab5 SHA1 02100d4204f95573470a7a9a8a07525b65843143 SHA256 ab6cddc303f1b3a68517644fdeb693086b5a3f7e93b16bd276c1e41fec52f60e
-AUX fix-sb-concurrency-tests.patch 563 RMD160 3ee25cd3b6563db8922b1a747c97987fe92f1c45 SHA1 5514e6c697006b0e3e3bcbf1acd72c2736a43194 SHA256 2ac5f16c07168b4677cc8969e02a189a431f3064e666b407eaeb6d14aa353138
+AUX 9999-gentoo-fix_build_system.patch 19470 RMD160 3656e1b64f27d54773f0dd49a2ffb4ac68ce226d SHA1 b24d286e9a0554dbe39a6ae938a8f11d88cfa930 SHA256 433a1688753071baaaa1c7af29b75a9f2f8c01bb2f2aef15f1f401c2aa8ea35d
 AUX gentoo-fix_install_man.patch 399 RMD160 8cbc6d8d2f70c10cf76a0a2a3e574b8267d97370 SHA1 44186fdfdd12db5094abed07259016dc6b377695 SHA256 7e3e3f84be6d4dae51953825daaf26d8fe1482fd2f4e9d017297dd8ef55ebe47
 AUX gentoo-fix_linux-os-c.patch 418 RMD160 558a7cc1c212729e39f746d7db9cc7324d23a64f SHA1 5ff812499525ec51c0debdac78fc6d39bc4d55a0 SHA256 50b310b3d72b380b91828730a5539638decb6a4df6d28f93dff84ddad824b2ae
 DIST sbcl-1.0.23-mips-linux-binary.tar.bz2 7932957 RMD160 5fc1f48beff1b67e101875aae4108fa2aa90d574 SHA1 fd409307855d354469297334588a988c35db386d SHA256 9a4ef25e7119ad12ca4789ad8e333b6550bbb865f8eae06c9fb66fbf9323f960
diff --git a/dev-lisp/sbcl/files/9999-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/9999-gentoo-fix_build_system.patch
index 788730c2..8e3cc8ce 100644
--- a/dev-lisp/sbcl/files/9999-gentoo-fix_build_system.patch
+++ b/dev-lisp/sbcl/files/9999-gentoo-fix_build_system.patch
@@ -1,5 +1,5 @@
 diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
-index a9e55d7..90df9b6 100644
+index 6bf4a36..9e5c1f6 100644
 --- a/contrib/asdf-module.mk
 +++ b/contrib/asdf-module.mk
 @@ -1,3 +1,5 @@
@@ -18,7 +18,7 @@ index a9e55d7..90df9b6 100644
  UNAME:=$(shell uname -s)
  
  ifeq (SunOS,$(UNAME))
-@@ -20,7 +25,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
    CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
  endif
  
@@ -140,7 +140,7 @@ index 0d3d79a..ea3eaf7 100644
  OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
  
 diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
-index d2fe76c..57fccb7 100644
+index f8ceded..0bfe84a 100644
 --- a/src/runtime/Config.ppc-linux
 +++ b/src/runtime/Config.ppc-linux
 @@ -9,8 +9,7 @@
@@ -454,25 +454,27 @@ index e1efb79..b17bfd4 100644
  
  ifdef LISP_FEATURE_LARGEFILE
 diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
-index cfaac20..0e0963a 100644
+index f0fbe19..29d8bd4 100644
 --- a/src/runtime/GNUmakefile
 +++ b/src/runtime/GNUmakefile
-@@ -18,25 +18,17 @@ TARGET=sbcl
+@@ -18,27 +18,19 @@ TARGET=sbcl
  # Config file. Most of them are same on most systems right now.
  # If you need to override one of these, do it in Config.
  LD = ld
 -LINKFLAGS = -g
-+SBCL_LDFLAGS = -g
++LDFLAGS = -g
  NM = nm -gp
  DEPEND_FLAGS = -MM
  GREP = grep
  
+ include ../../output/prefix.def
+ 
 -CFLAGS = -g -Wall -Wsign-compare -O3
 -ASFLAGS = $(CFLAGS)
--CPPFLAGS = -I.
+-CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
 +SBCL_CFLAGS = -g -Wall -Wsign-compare -O3
 +SBCL_ASFLAGS = $(SBCL_CFLAGS)
-+SBCL_CPPFLAGS = -I.
++SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
  
 -# Give make access to the target Lisp features.
 -include genesis/Makefile.features
@@ -489,7 +491,7 @@ index cfaac20..0e0963a 100644
  
  COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
  	dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \
-@@ -56,7 +48,7 @@ LIBS = ${OS_LIBS} -lm
+@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm
  targets: $(TARGET) sbcl.nm
  
  $(TARGET): $(OBJS)
@@ -542,10 +544,10 @@ index 2f10a8b..dc99ebc 100644
  all: grovel-headers determine-endianness where-is-mcontext \
          modify-ldt-struct-name sigaction-sa-nodefer-works-test
 diff --git a/tools-for-build/ldso-stubs.lisp b/tools-for-build/ldso-stubs.lisp
-index 5d9e0d7..95a7d67 100644
+index 1164a5c..471859e 100644
 --- a/tools-for-build/ldso-stubs.lisp
 +++ b/tools-for-build/ldso-stubs.lisp
-@@ -294,6 +294,7 @@ ldso_stub__ ## fct: ;                  \\
+@@ -295,6 +295,7 @@ ldso_stub__ ## fct: ;                  \\
                     "unlink"
                     "utimes"
                     "wait3"
diff --git a/dev-lisp/sbcl/files/fix-sb-concurrency-tests.patch b/dev-lisp/sbcl/files/fix-sb-concurrency-tests.patch
deleted file mode 100644
index ad989214..00000000
--- a/dev-lisp/sbcl/files/fix-sb-concurrency-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/contrib/sb-concurrency/tests/test-utils.lisp b/contrib/sb-concurrency/tests/test-utils.lisp
-index bc21ebc..992b6d6 100644
---- a/contrib/sb-concurrency/tests/test-utils.lisp
-+++ b/contrib/sb-concurrency/tests/test-utils.lisp
-@@ -3,7 +3,7 @@
- #+sb-thread
- (progn
- 
--(defparameter +timeout+ 30.0)
-+(defparameter +timeout+ 120.0)
- 
- (defun make-threads (n name fn)
-   (loop for i from 1 to n
-@@ -23,4 +23,4 @@
-     (ignore-errors
-       (terminate-thread thread))))
- 
--) ;; #+sb-thread (progn ...
-\ No newline at end of file
-+) ;; #+sb-thread (progn ...