Ticket #14078: r-2.15.2.p1.diff

File r-2.15.2.p1.diff, 2.1 KB (added by jpflori, 9 years ago)

Spkg diff, for review only.

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    3636     The corresponding patch to m4/clibs.m4 is not included, as
    3737     autoconf-2.68 gives errors, even on the clean upstream sources.
    3838   - R.sh.in: Set R_HOME_DIR to "${SAGE_LOCAL}/lib/R/" when running R.
     39   - cygwin-logl.patch: disable use of logl on Cygwin, see #14078.
    3940
    4041== Changelog ==
     42
     43=== r-2.15.2.p1 (Jean-Pierre Flori, 7 February 2013) ===
     44 * #14078: do not use logl on Cygwin.
     45
    4146=== r-2.15.2.p0 (Emmanuel Charpentier, 25 January 2013) ===
    42   * "monkey see-monkey do" upgrade to current upstream
    43   * simple drop of curent source in src
    44   * removed patches/install_parallel.patch : patch complained
    45     about a "reversed (or previously applied) patch detected!".
    46   * re-enables installation of upstream source packages
    47     (ticket #14008).
     47 * "monkey see-monkey do" upgrade to current upstream
     48 * simple drop of curent source in src
     49 * removed patches/install_parallel.patch : patch complained
     50   about a "reversed (or previously applied) patch detected!".
     51 * re-enables installation of upstream source packages
     52   (ticket #14008).
    4853
    4954=== r-2.14.0.p6 (Jeroen Demeyer, 10 September 2012) ===
    5055 * #13443: some clean up of spkg-install.
     
    155160 * added SAGE_LOCAL check to spkg-check, spkg-install
    156161 * verify that rpy builds fine on OSX
    157162 * remove tar.gzs from recommended directory
    158  
     163
    159164=== r-2.6.1.p11 (Michael Abshoff, Jan. 26th, 2008) ===
    160165 * fix rpy to work with ATLAS
    161166 * fix parallel make since make install is broken with it.
     
    175180
    176181=== r-2.6.1.p7 ===
    177182 * Updated the rpy package using trac #1427
    178 
  • new file patches/cygwin-logl.patch

    diff --git a/patches/cygwin-logl.patch b/patches/cygwin-logl.patch
    new file mode 100644
    - +  
     1diff -dru src.orig/src/nmath/nmath.h src/src/nmath/nmath.h
     2--- src.orig/src/nmath/nmath.h  2012-04-16 00:05:35.000000000 +0200
     3+++ src/src/nmath/nmath.h       2013-02-07 10:48:06.473614931 +0100
     4@@ -21,6 +21,10 @@
     5 #ifndef MATHLIB_PRIVATE_H
     6 #define MATHLIB_PRIVATE_H
     7 
     8+#ifdef __CYGWIN__
     9+#define logl log
     10+#endif /* __CYGWIN__ */
     11+
     12 #ifdef HAVE_CONFIG_H
     13 #  include <config.h>
     14 #endif