Ticket #14869: mpfr.diff

File mpfr.diff, 3.0 KB (added by vbraun, 8 years ago)

Spkg diff for review purposes only

  • .hgignore

    diff -r 5b8eb351eda3 -r 07a6368a1d43 .hgignore
    a b  
    1 src
    2 patches/upstream
     1^src/
     2
  • SPKG.txt

    diff -r 5b8eb351eda3 -r 07a6368a1d43 SPKG.txt
    a b  
    4646 * When building Sage binaries for wide-spread distribution, set the variable
    4747   `INCLUDE_MPFR_PATCH` to 1, to include a patch which avoids failures on sun4v
    4848   machines.  (This applies to at least SunOS / Solaris.)
    49  * Check whether there are new "official" upstream patches, i.e., such put into
    50    http://www.mpfr.org/mpfr-current/allpatches (if our version is the latest
    51    released one); see also http://www.mpfr.org/mpfr-current/#bugs .
    52    (As of April 13th 2012, our current version is 3.1.0-p8; the sources in
    53    `src/` are kept vanilla, the cumulative upstream patch is in
    54    `patches/upstream/` and gets applied by `spkg-install`.)
    5549 * Make sure the patches still apply.
    5650 * Make sure MPFR's settings of `CC` and `CFLAGS` still get properly extracted,
    5751   currently from its `config.log` in the `src/` directory.
     
    5953   the issues without that have meanwhile been fixed.  (Then we should
    6054   actually pass `--enable-thread-safe`.)
    6155
     56== TODO ==
     57
     58* The workaround for a gcc bug on the T2 Solaris box is probably no
     59  longer needed; Isthere is a T2 to test on left?
     60
     61* --disable-thread-safe should be switched to --enable-thread-safe,
     62  need to check that this works on the buildbot machines
     63
    6264== Changelog ==
    6365
     66=== mpfr-3.1.2.p0 (Volker Braun, 8 July 2013) ===
     67 * Trac #14869: Update to latest upstream
     68 * It seems that upstream is no longer distributing official patches
     69   on top of official releases but only a single tarball (good!), so the
     70   references to "official" upstream patches have been removed.
     71
    6472=== mpfr-3.1.0.p2 (Jeroen Demeyer, 28 May 2012) ===
    6573 * Trac #12751: Apply the ia64 workaround for gcc-4.7.0 *only* on
    6674   gcc-4.7.0 and not on other gcc-4.7.x versions.
  • spkg-install

    diff -r 5b8eb351eda3 -r 07a6368a1d43 spkg-install
    a b  
    8282        echo
    8383    fi # $UNAME=SunOS
    8484
    85     # Apply official upstream patches (if any):
    86     ls ../patches/upstream/*.patch &>/dev/null &&
    87     echo "Applying official upstream patches..." &&
    88     for patch in ../patches/upstream/*.patch; do
    89         basename "$patch"
    90         # We don't need '-N' and '-Z' here, options suggested by upstream:
    91         if ! patch -p1 <"$patch"; then
    92             echo >&2 "Error: '$patch' failed to apply."
    93             exit 1
    94         fi
    95     done &&
    96     echo
    97 
    98     # Further patches for Sage should get applied here, i.e., after all
    99     # upstream patches have been applied, which also means they should be
    100     # based on the already (upstream-)patched upstream sources.
     85    # Further patches for Sage should get applied here
    10186}
    10287
    10388mpfr_get_upstream_selected_cflags() # Get MPFR's choice on empty CC and CFLAGS.