[Rprotobuf-commits] r739 - pkg/src windows/lib windows/lib/i386 windows/lib/x64

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

Author: jeroenooms
Date: 2014-01-10 23:27:55 +0100 (Fri, 10 Jan 2014)
New Revision: 739

Added:
   windows/lib/i386/
   windows/lib/i386/libprotobuf.a
   windows/lib/x64/
   windows/lib/x64/libprotobuf.a
Modified:
   pkg/src/Makevars.win
Log:
add one-time static libraries for windows for CRAN

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2014-01-10 20:16:15 UTC (rev 738)
+++ pkg/src/Makevars.win	2014-01-10 22:27:55 UTC (rev 739)
@@ -1,7 +1,13 @@
 # -*- mode: Makefile -*-
 ##
 ## The folders C:/protobuf-2.5.0/lib/{i386,x64}/ contain static libraries for windows.
-RCPP_LDFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
-PROTOBUFROOT= "C:/protobuf-2.5.0"
+## There is a problem with mingw64 and libprotobuf that results in ld reading symbols multiple times
+## We can workaround it using "-Wl,-allow-multiple-definition".
+## See also https://sourceware.org/bugzilla/show_bug.cgi?id=12762
+##
+MINGW64HACK= "-Wl,-allow-multiple-definition"
+RCPP_LDFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(MINGW64HACK)
+PROTOBUFROOT= "../protobuf-2.5.0"
 PKG_CPPFLAGS= -I$(PROTOBUFROOT)/src
 PKG_LIBS=$(RCPP_LDFLAGS) -L$(PROTOBUFROOT)/lib${R_ARCH} -lprotobuf
+

Added: windows/lib/i386/libprotobuf.a
===================================================================
(Binary files differ)


Property changes on: windows/lib/i386/libprotobuf.a
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: windows/lib/x64/libprotobuf.a
===================================================================
(Binary files differ)


Property changes on: windows/lib/x64/libprotobuf.a
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream