3 files changed, 4 insertions, 140 deletions

diff --git a/math/R/files/patch-configure b/math/R/files/patch-configure
deleted file mode 100644
index da96c4789130..000000000000
--- a/math/R/files/patch-configure
+++ /dev/null
@@ -1,113 +0,0 @@
---- configure.orig	2016-04-25 22:17:08 UTC
-+++ configure
-@@ -22470,13 +22470,13 @@ if test "x$ac_cv_lib_mw__mwvalidcheckl" 
-   LIBM=-lmw
- fi
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
--$as_echo_n "checking for cos in -lm... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lquadmath -lm" >&5
-+$as_echo_n "checking for cos in -lquadmath -lquadmath -lm... " >&6; }
- if ${ac_cv_lib_m_cos+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
-+LIBS="-lquadmath -lquadmath -lm  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -22507,18 +22507,18 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
- $as_echo "$ac_cv_lib_m_cos" >&6; }
- if test "x$ac_cv_lib_m_cos" = xyes; then :
--  LIBM="$LIBM -lm"
-+  LIBM="$LIBM -lquadmath -lquadmath -lm"
- fi
- 
-   ;;
- *)
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
--$as_echo_n "checking for cos in -lm... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lquadmath -lm" >&5
-+$as_echo_n "checking for cos in -lquadmath  -lquadmath -lm... " >&6; }
- if ${ac_cv_lib_m_cos+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
-+LIBS="-lquadmath -lquadmath -lm  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -22549,7 +22549,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
- $as_echo "$ac_cv_lib_m_cos" >&6; }
- if test "x$ac_cv_lib_m_cos" = xyes; then :
--  LIBM=-lm
-+  LIBM="-lquadmath -lquadmath -lm"
- fi
- 
-   ;;
-@@ -22560,13 +22560,13 @@ esac
- ## </NOTE>
- ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
- ## the following as well.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
--$as_echo_n "checking for sin in -lm... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lquadmath -lquadmath -lm" >&5
-+$as_echo_n "checking for sin in -lquadmath -lquadmath -lm... " >&6; }
- if ${ac_cv_lib_m_sin+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
-+LIBS="-lquadmath -lquadmath -lm  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -22601,7 +22601,7 @@ if test "x$ac_cv_lib_m_sin" = xyes; then
- #define HAVE_LIBM 1
- _ACEOF
- 
--  LIBS="-lm $LIBS"
-+  LIBS="-lquadmath -lquadmath -lm $LIBS"
- 
- fi
- 
-@@ -27958,7 +27958,7 @@ fi
- ## if nothing was obtained for SHLIB_CXXLDFLAGS.
- ##
- ## Note also that some systems (formerly AIX) do not allow for unresolved
--## symbols at link time.  For such systems, we link against -lm (in case
-+## symbols at link time.  For such systems, we link against -lquadmath -lm (in case
- ## it exists) when building a shlib module via SHLIB_LIBADD.
- 
- main_ld="${CC}"
-@@ -30147,7 +30147,7 @@ if ${ac_cv_lib_rt_clock_gettime+:} false
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrt  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -30190,7 +30190,7 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
- #define HAVE_LIBRT 1
- _ACEOF
- 
--  LIBS="-lrt $LIBS"
-+  LIBS="$LIBS"
- 
- fi
- 
-@@ -35109,7 +35109,7 @@ fi
-     ## Part 2.  Try finding the tk library.
-     if test -n "${TK_CONFIG}"; then
-       . ${TK_CONFIG}
--      TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW}"
-+      TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW} ${TCL_LD_FLAGS}"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_Init in -ltk" >&5
- $as_echo_n "checking for Tk_Init in -ltk... " >&6; }
diff --git a/math/R/files/patch-src__nmath__standalone__test.c b/math/R/files/patch-src__nmath__standalone__test.c
deleted file mode 100644
index 0aefc4bf9fc6..000000000000
--- a/math/R/files/patch-src__nmath__standalone__test.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nmath/standalone/test.c.orig	2015-08-25 22:18:53 UTC
-+++ src/nmath/standalone/test.c
-@@ -38,7 +38,7 @@ main(int argc, char** argv)
-     qnorm(0.7, 0.0, 1.0, 0, 0);
-     printf("*** loaded '%s'\n", argv[0]);
-     set_seed(123, 456);
--    N01_kind = AHRENS_DIETER;
-+    N01type N01_kind = AHRENS_DIETER;
-     printf("one normal %f\n", norm_rand());
-     set_seed(123, 456);
-     N01_kind = BOX_MULLER;
diff --git a/math/R/files/patch-src_extra_tre_tre-internal.h b/math/R/files/patch-src_extra_tre_tre-internal.h
index 9648c7b240ce..1f059c45942e 100644
--- a/math/R/files/patch-src_extra_tre_tre-internal.h
+++ b/math/R/files/patch-src_extra_tre_tre-internal.h
@@ -1,22 +1,10 @@
---- src/extra/tre/tre-internal.h.orig	2016-05-05 10:54:54 UTC
+--- src/extra/tre/tre-internal.h.orig	2016-07-23 16:50:17 UTC
 +++ src/extra/tre/tre-internal.h
-@@ -17,6 +17,7 @@
- #include <wctype.h>
+@@ -18,6 +18,7 @@
  #endif /* !HAVE_WCTYPE_H */
  
-+#include <limits.h>
  #include <ctype.h>
++#include <stdint.h>
  #include "tre.h"
  
-@@ -47,7 +48,11 @@
- #ifdef TRE_WCHAR
- 
- /* Wide characters. */
-+#if WCHAR_MAX <= INT_MAX
- typedef wint_t tre_cint_t;
-+#else /* WCHAR_MAX > INT_MAX */
-+#define TRE_CHAR_MAX INT_MAX
-+#endif
- /* Workaround problem seen on AIX, (2010 & 2015), e.g.,
-     https://stat.ethz.ch/pipermail/r-devel/2015-October/071902.html
-   WCHAR_MAX = UINT32_MAX on AIX and that is "not possible to work"
+ #ifdef TRE_DEBUG