branch update

git-svn-id: https://svn.r-project.org/R/trunk@29276 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/manual/R-admin.texi

@@ -982,7 +982,7 @@ Irix 6.5 and Alpha/OSF1 (aka Tru64).
 
 To build in a separate directory you need a @command{make} that uses the
 @code{VPATH} variable, for example GNU @command{make}, or Sun
-@command{make} on Solaris 2.7/8 (but not earlier).
+@command{make} on Solaris 2.7/8/9 (but not earlier).
 
 If you want to use a @command{make} by another name, for example if your
 GNU @command{make} is called @samp{gmake}, you need to set the variable
@@ -1212,6 +1212,10 @@ Tcl/Tk libraries, @code{libpng}, @code{libjpeg} and @code{zlib}) which
 might be linked against.  Fortunately these are normally built as shared
 libraries with the exception of the ATLAS BLAS libraries.
 
+It seems that @samp{gcc 3.4.0} on @samp{ix86} Linux defeats attempts by
+the LAPACK code to avoid computations entirely in extended-precision
+registers, so file @file{src/modules/lapack/dlamc.f} may need to
+compiled without optimization or with @code{-ffloat-store}.
 
 @node Mac OS X, Solaris, Linux, Platform notes
 @subsection Mac OS X
@@ -1258,7 +1262,7 @@ The Solaris versions of several of the tools needed to build @R{}
 path.
 
 @command{gcc} 3.2.1 and 3.2.2 generate incorrect code on 32-bit Solaris
-builds with optimization, but versions 3.1, 3.2, 3.2.3  and 3.3.x work
+builds with optimization, but versions 3.1, 3.2, 3.2.3 and later work
 correctly.  At least files @file{src/main/engine.c},
 @file{src/main/graphics.c} and @file{src/modules/devX11.c} are affected.
 

src/modules/lapack/Makefile.in

@@ -60,6 +60,11 @@ Makedeps: Makefile $(DEPENDS)
 	@cat $(DEPENDS) >> Makefile
 	@touch $@
 
+## we need to force stores with gcc 3.4.0 on i686
+#DLAMC_FFLAGS=$(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS) -ffloat-store
+#dlamc.lo: dlamc.f
+#	$(F77) $(DLAMC_FFLAGS) -c $< -o $@
+
 R: Makefile
 	@$(MAKE) Makedeps
 @USE_EXTERNAL_LAPACK_FALSE@	@$(MAKE) $(Rlapack_la) Rlapack_install

src/nmath/standalone/Makefile.in

@@ -9,6 +9,8 @@ top_builddir = ../../..
 subdir = src/nmath/standalone
 
 include $(top_builddir)/Makeconf
+.c.lo:
+	$(LIBTOOL) --mode=compile $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS_LO) -c $< -o $@
 
 includedir = ${prefix}/include
 
@@ -58,15 +60,13 @@ Rexeclibdir_LIBRARIES = libRmath.a
 libRmath_a_SOURCES = $(SOURCES)
 libRmath_a_OBJECTS = $(OBJECTS)
 
-## <FIXME>
 ## Change to 'libRmath.la' when using libtool for shlibs.
 ## Remove when using automake ...
-libRmath_la = libRmath$(DYLIB_EXT)
-## </FIXME>
+libRmath_la = libRmath.la
 Rexeclibdir_LTLIBRARIES = $(libRmath_la)
 libRmath_la_SOURCES = $(SOURCES)
 libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
-libRmath_la_LDFLAGS =
+libRmath_la_LDFLAGS = -release $(VERSION)
 
 CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
 DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
@@ -116,14 +116,14 @@ libRmath.a: $(libRmath_a_OBJECTS)
 	$(RANLIB) $@
 
 $(libRmath_la): $(libRmath_la_OBJECTS)
-	$(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS)
+	$(LIBTOOL) --mode=link $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) -rpath $(libdir)
 
 test: $(srcdir)/test.c
-	$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
 	  -L. -lRmath -lm
 
 install: installdirs install-header
-	@!(test -f $(libRmath_la)) || $(SHELL) $(top_srcdir)/tools/copy-if-change $(libRmath_la) $(libdir)/$(libRmath_la)
+	@!(test -f $(libRmath_la)) || $(LIBTOOL) --mode=install install $(libRmath_la) $(libdir)/$(libRmath_la)
 	@!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(libdir)/libRmath.a
 
 install-header:
@@ -136,7 +136,7 @@ installdirs:
 	@$(MKINSTALLDIRS) $(libdir)
 
 uninstall:
-	@rm -f $(includedir)/Rmath.h $(libdir)/$(libRmath_la) $(libdir)/libRmath.a
+	@rm -f $(includedir)/Rmath.h $(libdir)/libRmath.*
 
 mostlyclean: clean
 clean: