22949613 R incorrectly assumes __SUNPRO_CC == stlport
authorRich Burridge <rich.burridge@oracle.com>
Wed, 16 Mar 2016 09:54:47 -0700
changeset 5617 58e4e2a36e77
parent 5616 44893e18e88a
child 5618 a7df12d981ea
22949613 R incorrectly assumes __SUNPRO_CC == stlport
components/r/patches/03-fix-studio-stdport.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/r/patches/03-fix-studio-stdport.patch	Wed Mar 16 09:54:47 2016 -0700
@@ -0,0 +1,18 @@
+The /usr/lib/64/R/include/R_ext/Print.h makes the assumption that
+__SUNPRO_CC == stlport which is incorrect in the way we deliver R in
+the version that's in Solaris.
+
+This problem has been reported upstream at:
+https://bugs.r-project.org/bugzilla/show_bug.cgi?id=16767
+
+--- R-3.2.3/src/include/R_ext/Print.h.orig	2016-03-16 06:31:42.210416076 -0700
++++ R-3.2.3/src/include/R_ext/Print.h	2016-03-16 06:52:39.625133958 -0700
[email protected]@ -27,7 +27,7 @@
+    defined in namespace std. */
+ # ifdef R_USE_C99_IN_CXX
+ #  include <cstdarg>
+-#  ifdef __SUNPRO_CC
++#  if defined(__SUNPRO_CC) && defined(_STLP_VENDOR_CSTD)
+ using _STLP_VENDOR_CSTD::va_list;
+ #  endif
+ # endif