Skip to content
Browse files

start to clean up

git-svn-id: https://svn.r-project.org/R/branches/C-link@38836 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 19b1b61 commit 5d63136f08b520117db979da114e616048dca3b0 ripley committed Aug 11, 2006
View
2 etc/Makeconf.in
@@ -69,7 +69,7 @@ ALL_CFLAGS = $(R_XTRA_CFLAGS) $(PKG_CFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(CFLAG
ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) $(PKG_CPPFLAGS) $(CPPFLAGS) $(CLINK_CPPFLAGS)
ALL_CXXFLAGS = $(R_XTRA_CXXFLAGS) $(PKG_CXXFLAGS) $(CXXPICFLAGS) $(SHLIB_CXXFLAGS) $(CXXFLAGS)
ALL_FFLAGS = $(R_XTRA_FFLAGS) $(PKG_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
-ALL_LIBS = $(CLINK_LDFLAGS) $(PKG_LIBS) $(SHLIB_LIBADD) $(LIBR)
+ALL_LIBS = $(PKG_LIBS) $(SHLIB_LIBADD) $(LIBR)
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .C .d .f .f90 .f95 .o
View
2 src/gnuwin32/MakeDll
@@ -48,7 +48,7 @@ CPPFLAGS=$(PKG_CPPFLAGS) -I$(RHOME)/include $(CLINK_CPPFLAGS)
CFLAGS=$(CPPFLAGS) $(DEBUGFLAG) $(COPTFLAG) -std=gnu99 $(PKG_CFLAGS)
CXXFLAGS=$(CPPFLAGS) $(DEBUGFLAG) $(CXXOPTFLAG) $(PKG_CXXFLAGS)
FFLAGS=$(FOPTFLAG) $(DEBUGFLAG) $(PKG_FFLAGS)
-DLLLIBS=-L$(RHOME)/bin $(CLINK_LDFLAGS) $(PKG_LIBS) $(EXTRA_LIBS) -lR
+DLLLIBS=-L$(RHOME)/bin $(PKG_LIBS) $(EXTRA_LIBS) -lR
RESFLAGS=--include-dir $(RHOME)/include
# for use by Makevars.win
R_HOME=$(RHOME)
View
2 src/gnuwin32/MakePkg
@@ -242,10 +242,8 @@ ifneq ($(strip $(LOBJS)),)
makefiles="$${makefiles} -f \"${HOME}/.R/Makevars\""; \
fi; \
CLINK_CPPFLAGS=`echo "tools:::.find_cinclude_paths(file='DESCRIPTION')" | $(REXE)`; \
- CLINK_LDFLAGS=`echo "tools:::.find_clink_paths(file='DESCRIPTION')" | $(REXE)`; \
$(MAKE) --no-print-directory -C $(SSPKG) RHOME=$(RHOME) \
DLLNAME=$(DLLNAME) CLINK_CPPFLAGS=$${CLINK_CPPFLAGS} \
- CLINK_LDFLAGS=$${CLINK_LDFLAGS} \
$${makefiles}
@$(ECHO) " ... DLL made"
endif
View
26 src/library/base/R/dynload.R
@@ -1,27 +1,5 @@
-dyn.load <- function(x, local=TRUE, now=TRUE, linkingTo=NULL)
-{
- if(length(linkingTo) && .Platform$OS.type == "windows") {
- if(!is.character(linkingTo))
- stop("'linkingTo' must be a character vector")
- tmp <- match(paste("package", linkingTo, sep=":"), search())
- if(any(is.na(tmp))) {
- msg <-
- sprintf(ngettext(sum(is.na(tmp)),
- "linking to package %s not found on search path",
- "linking to packages %s not found on search path"),
- paste(sQuote(linkingTo[is.na(tmp)]),
- collapse=", "))
- stop(msg, domain = NA)
- }
- path <- Sys.getenv("PATH")
- path2 <- paste(path, tmp, sep=.Platform$path.sep)
- Sys.putenv(paste("PATH=", path2, sep=""))
- res <- .Internal(dyn.load(x, as.logical(local), as.logical(now)))
- Sys.putenv(paste("PATH=", path, sep=""))
- res
- } else
- .Internal(dyn.load(x, as.logical(local), as.logical(now)))
-}
+dyn.load <- function(x, local=TRUE, now=TRUE)
+ .Internal(dyn.load(x, as.logical(local), as.logical(now)))
dyn.unload <- function(x)
.Internal(dyn.unload(x))
View
8 src/library/base/man/dynload.Rd
@@ -8,7 +8,7 @@
Fortran subroutine is available.
}
\usage{
-dyn.load(x, local = TRUE, now = TRUE, linkingTo = NULL)
+dyn.load(x, local = TRUE, now = TRUE)
dyn.unload(x)
is.loaded(symbol, PACKAGE = "", type = "")
@@ -34,12 +34,6 @@ is.loaded(symbol, PACKAGE = "", type = "")
It is ignored on Windows.
#endif
}
- \item{linkingTo}{\code{NULL} or a character vector. Indicates one or
- more loaded packages (by name) to which to link the DLL.
-#ifdef unix
- Currently only used on Windows.
-#endif
- }
\item{symbol}{a character string giving a symbol name.}
\item{PACKAGE}{if supplied, confine the search for the \code{name} to
the DLL given by this argument (plus the conventional extension,
View
19 src/library/tools/R/admin.R
@@ -680,25 +680,6 @@ function(dir, packages)
return(invisible())
}
-.find_clink_paths <- function(pkgs, lib.loc = NULL, file = NULL)
-{
- ## given a character string of comma-separated package names,
- ## find where the packages are installed and generate
- ## -L"/path/to/package/libs" ...
-
- if(!is.null(file)) {
- tmp <- read.dcf(file, "LinkingTo")[1,1]
- if(is.na(tmp)) return(invisible())
- pkgs <- tmp
- }
- pkgs <- strsplit(pkgs[1], ",[:blank]*")[[1]]
- paths <- .find.package(pkgs, lib.loc, quiet=TRUE)
- if(length(paths))
- cat(paste(paste('-L"', paths, '/libs"', sep=""), collapse=" "))
- return(invisible())
-}
-
-
### Local variables: ***
### mode: outline-minor ***
### outline-regexp: "### [*]+" ***
View
6 src/scripts/INSTALL.in
@@ -533,10 +533,8 @@ do_install_source () {
message "libs"
has_error=false
CLINK_CPPFLAGS=`echo "tools:::.find_cinclude_paths(file='DESCRIPTION')" | \
- "$(R_EXE)" --vanilla --slave`
- CLINK_LDFLAGS=`echo "tools:::.find_clink_paths(file='DESCRIPTION')" | \
- "$(R_EXE)" --vanilla --slave`
- export CLINK_CPPFLAGS CLINK_LDFLAGS
+ "${R_EXE}" --vanilla --slave`
+ export CLINK_CPPFLAGS
if ${debug}; then set -x; fi
${MKDIR_P} "${R_PACKAGE_DIR}/libs${R_ARCH}"
if test -f src/Makefile; then

0 comments on commit 5d63136

Please sign in to comment.
Something went wrong with that request. Please try again.