[Rprotobuf-commits] r752 - in pkg: . src

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

Author: jeroenooms
Date: 2014-01-12 20:28:26 +0100 (Sun, 12 Jan 2014)
New Revision: 752

Modified:
   pkg/configure.win
   pkg/src/Makevars.win
Log:
update makevars for CRAN

Modified: pkg/configure.win
===================================================================
--- pkg/configure.win	2014-01-11 23:44:54 UTC (rev 751)
+++ pkg/configure.win	2014-01-12 19:28:26 UTC (rev 752)
@@ -1,5 +1,7 @@
-# This is a temporary solution for when the headers/lib are not avaialble on the machine
-"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
-download.file("http://www.stat.ucla.edu/~jeroen/files/protobuf-2.5.0-windows.zip", "lib.zip");
-unzip("lib.zip");
-'
\ No newline at end of file
+# Uncomment this to build on machines where the headers/lib are not installed
+# on the machine already. 
+#
+#
+# "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
+# download.file("http://www.stat.ucla.edu/~jeroen/files/protobuf-2.5.0-windows.zip", "lib.zip");
+# unzip("lib.zip");'

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2014-01-11 23:44:54 UTC (rev 751)
+++ pkg/src/Makevars.win	2014-01-12 19:28:26 UTC (rev 752)
@@ -1,15 +1,14 @@
 # -*- mode: Makefile -*-
 ##
-## The folders ../protobuf-2.5.0/lib/{i386,x64}/ contain static libraries
-## for windows. Note that mingw64-4.8.1 has an issue that results in ld
-## reading symbols multiple times. As a workaround, we can add a flag
-## "-Wl,-allow-multiple-definition" to RCPP_LDFLAGS.
-## See also https://sourceware.org/bugzilla/show_bug.cgi?id=12762
-## However the problem did not appear for mingw 4.7.3. So that's what we
-## ended up using.
+## On the CRAN windows builder, the heades and library are installed in
+## a directory ${LIB_PROTOBUF}. On other machines, the configure.win file
+## contains instructions for getting these files.
 ##
-## MINGW64HACK= "-Wl,-allow-multiple-definition"
+## Note that mingw64 4.8.1 had an issue that results in ld reading 
+## symbols multiple times. As a workaround, we can add a flag
+## "-Wl,-allow-multiple-definition" to RCPP_LDFLAGS. However the 
+## problem did not appear for mingw 4.7.3. So that's what we used.
+##
 RCPP_LDFLAGS= $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
-PROTOBUFROOT= "../protobuf-2.5.0"
-PKG_CPPFLAGS= -I$(PROTOBUFROOT)/include
-PKG_LIBS=$(RCPP_LDFLAGS) -L$(PROTOBUFROOT)/lib${R_ARCH} -lprotobuf
+PKG_CPPFLAGS=-I${LIB_PROTOBUF}/include -I../protobuf-2.5.0/include
+PKG_LIBS=$(RCPP_LDFLAGS) -L${LIB_PROTOBUF}/lib${R_ARCH} -L../protobuf-2.5.0/lib${R_ARCH} -lprotobuf