[Rcpp-commits] r4312 - in pkg/Rcpp: . inst src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-04-28 03:58:44 +0200 (Sun, 28 Apr 2013)
New Revision: 4312

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS.Rd
   pkg/Rcpp/src/Makevars
Log:
in src/Makevars, improved use as well as a new possible overrride of /usr/bin/install_name_tool on OS X, once again contributed by Simon


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-04-20 01:15:28 UTC (rev 4311)
+++ pkg/Rcpp/ChangeLog	2013-04-28 01:58:44 UTC (rev 4312)
@@ -1,13 +1,18 @@
+2013-04-27  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Makevars: Improved use as well as a new possible overrride of
+	/usr/bin/install_name_tool on OS X, once again contributed by Simon
+
 2013-04-16  Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/sugar/functions/na_omit.h : new function na_omit to remove
-        missing values from a vector. 
+        missing values from a vector.
         * src/attributes.cpp : portability fix (from Martyn Plummer)
         * include/Rcpp/api/meat/Vector.h : portability fix (from Martyn Plummer)
-        
+
 2013-04-14  Romain Francois <romain at r-enthusiasts.com>
 
-        * include/Rcpp/traits/is_na.h: complex version did not work. 
+        * include/Rcpp/traits/is_na.h: complex version did not work.
         added default for VECSXP and EXPRSXP versions
 
 2013-04-02  Dirk Eddelbuettel  <edd at debian.org>

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-04-20 01:15:28 UTC (rev 4311)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-04-28 01:58:44 UTC (rev 4312)
@@ -14,14 +14,16 @@
       \item The \code{operator-()} semantics for \code{Date} and
       \code{Datetime} are now more inline with standard C++ behaviour.
     }
-    \item Changes in sugar:
+    \item Changes in Rcpp sugar:
     \itemize{
-        \item New function \code{na_omit} based on the stack overflow thread
+        \item New function \code{na_omit} based on the StackOverflow thread
         http://stackoverflow.com/questions/15953768/templated-rcpp-function-to-erase-na-values
     }
-    \item Portability
+    \item Changes in Rcpp build tools:
     \itemize{
         \item Fix (from Martyn Plummer) for solaris in handling SingleLogicalResult.     
+	\item The \code{src/Makevars} file can now optionally ovveride the
+	path for \code{/usr/bin/install_name_tool} which is used on OS X.
     }
 }
 

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2013-04-20 01:15:28 UTC (rev 4311)
+++ pkg/Rcpp/src/Makevars	2013-04-28 01:58:44 UTC (rev 4312)
@@ -3,8 +3,8 @@
 # Makevars for Rcpp 
 #
 # Copyright (C) 2008 - 2009 Dirk Eddelbuettel <edd at debian.org>
-# Copyright (C) 2008        Simon Urbanek <simon.urbanek at r-project.org>
-# Copyright (C) 2009 - 2011 Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2008, 2013  Simon Urbanek <simon.urbanek at r-project.org>
+# Copyright (C) 2009 - 2013 Dirk Eddelbuettel and Romain Francois
 
 ## $(SHLIB) is the usual default target that is built automatically from all source 
 ## files in this directory. userLibrary is an additional target for the second library
@@ -31,7 +31,7 @@
 
 $(USERLIB): 	$(OBJECTS)
 		$(SHLIB_CXXLD) -o $(USERLIB) $(OBJECTS) $(SHLIB_CXXLDFLAGS) $(ALL_LIBS)
-		@if test -e "/usr/bin/install_name_tool"; then /usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi
+		@: $${INSTALL_NAME_TOOL=/usr/bin/install_name_tool}; if test -e "$$INSTALL_NAME_TOOL"; then "$$INSTALL_NAME_TOOL" -id '$(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB)' '$(USERLIB)'; fi
 
 $(USERLIBST): 	$(OBJECTS)
 		$(AR) qc $(USERLIBST) $(OBJECTS)