From d8a558a8a4610ad11671690c64827c8d26afb5f7 Mon Sep 17 00:00:00 2001 From: "Logan C. Brooks" Date: Tue, 11 Jun 2024 18:29:56 -0700 Subject: [PATCH] Remove now-unnecessary Makevars with Rcpp::LdFlags Rcpp:::LdFlags() is deprecated and produces an empty string (https://www.rdocumentation.org/packages/Rcpp/versions/1.0.12/topics/LdFlags-deprecated), and hasn't been needed for long enough that there may not be loss in compatibility with current systems (https://github.com/RcppCore/Rcpp/issues/1302#issuecomment-2082670237). Removing these Makevars settings is a simple way to address issues for some system x Rprofile combinations (https://github.com/amices/mice/issues/646). --- src/Makevars | 27 --------------------------- src/Makevars.win | 3 --- 2 files changed, 30 deletions(-) delete mode 100644 src/Makevars delete mode 100644 src/Makevars.win diff --git a/src/Makevars b/src/Makevars deleted file mode 100644 index c880859a5..000000000 --- a/src/Makevars +++ /dev/null @@ -1,27 +0,0 @@ -## Use the R_HOME indirection to support installations of multiple R version -PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` - -## As an alternative, one can also add this code in a file 'configure' -## -## PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"` -## -## sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \ -## src/Makevars.in > src/Makevars -## -## which together with the following file 'src/Makevars.in' -## -## PKG_LIBS = @PKG_LIBS@ -## -## can be used to create src/Makevars dynamically. This scheme is more -## powerful and can be expanded to also check for and link with other -## libraries. It should be complemented by a file 'cleanup' -## -## rm src/Makevars -## -## which removes the autogenerated file src/Makevars. -## -## Of course, autoconf can also be used to write configure files. This is -## done by a number of packages, but recommended only for more advanced users -## comfortable with autoconf and its related tools. - - diff --git a/src/Makevars.win b/src/Makevars.win deleted file mode 100644 index 18d49b410..000000000 --- a/src/Makevars.win +++ /dev/null @@ -1,3 +0,0 @@ - -## Use the R_HOME indirection to support installations of multiple R version -PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")