[Sbcl-commits] CVS: sbcl/tools-for-build Makefile, 1.11, 1.12 grovel-features.sh, 1.12, 1.13 ldso-stubs.lisp, 1.29, 1.30

[Cyrus H. <sl...@us...>]

Update of /cvsroot/sbcl/sbcl/tools-for-build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10051/tools-for-build

Modified Files:
	Makefile grovel-features.sh ldso-stubs.lisp 
Log Message:
1.0.45.9: fix building on recent linux

 * Recent linux changes caused waitpid foreign symbol to go away so add it to
   undefineds and ldso-stubs
 * Recent linux linker default flags changes (--as-needed?) caused dlopen and
   friends to not be found at link time. Fix the tools-for-build/Makefile
   to pick up the build options from Config and fix grovel-features.sh to
   put the libs in LDLIBS instead of LDFLAGS


Index: Makefile
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	13 Nov 2006 16:03:32 -0000	1.11
+++ Makefile	20 Jan 2011 18:21:37 -0000	1.12
@@ -7,11 +7,12 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
--include genesis/Makefile.features
--include Config
+include ../src/runtime/genesis/Makefile.features
+include ../src/runtime/Config
 
 CPPFLAGS:=-I../src/runtime
-LDFLAGS:=$(LDFLAGS) $(OS_LIBS)
+LDFLAGS:=$(LDFLAGS)
+LDLIBS:=$(OS_LIBS)
 
 all: grovel-headers determine-endianness where-is-mcontext \
         modify-ldt-struct-name sigaction-sa-nodefer-works-test

Index: grovel-features.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/grovel-features.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- grovel-features.sh	19 Sep 2010 20:08:47 -0000	1.12
+++ grovel-features.sh	20 Jan 2011 18:21:37 -0000	1.13
@@ -9,7 +9,7 @@
 featurep() {
     bin="$1-test"
     rm -f $bin
-    $GNUMAKE $bin -I ../src/runtime > /dev/null 2>&1 && echo "input" | ./$bin> /dev/null 2>&1
+    $GNUMAKE $bin -I ../src/runtime ${make_flags} > /dev/null 2>&1 && echo "input" | ./$bin> /dev/null 2>&1
     if [ "$?" = 104 ]
     then
         printf " :$1"

Index: ldso-stubs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/ldso-stubs.lisp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ldso-stubs.lisp	19 Sep 2010 14:14:16 -0000	1.29
+++ ldso-stubs.lisp	20 Jan 2011 18:21:37 -0000	1.30
@@ -295,6 +295,7 @@
                    "unlink"
                    "utimes"
                    "wait3"
+                   "waitpid"
                    "write")
                  ;; These aren't needed on the X86 because they're microcoded into the
                  ;; FPU, so the Lisp VOPs can implement them directly without having to