Ticket #10188: mpir-spkg-install.diff

File mpir-spkg-install.diff, 1.9 KB (added by vbraun, 9 years ago)

Updated patch

  • SPKG.txt

    diff -r 0d1baf74a4df SPKG.txt
    a b  
    2727
    2828== Changelog ==
    2929
     30=== mpir-1.2.2.p2 (Volker Braun, Oct 28, 2010) ===
     31 * Clear the execstack (executable stack) flag from the shared libraries.
     32
    3033=== mpir-1.2.2.p1 (Georg S. Weber, May 18th 2010) ===
    3134 * Update the License information (e.g. above), as kindly requested
    3235   on the MPIR project homepage (see "http://www.mpir.org/past.html"):
  • spkg-install

    diff -r 0d1baf74a4df spkg-install
    a b  
    55   echo "Maybe run 'sage -sh'?"
    66   exit 1
    77fi
     8
     9
    810# Add a patch which allow MPIR to build with Sun Studio
    9 # if
    10 
    1111if [ "x`uname`" = "xSunOS" ] ; then
    1212   echo "Copying a version of gmp-h.in which is patched for Sun Studio"
    1313   cp patches/gmp-h.in src/
     
    1717   fi
    1818fi
    1919
     20
    2021# The Yasm build uses PYTHON from env to find python, so unset it
    2122# since the version from newest_version confuses it
    2223unset PYTHON
     
    4445build()
    4546{
    4647
    47     SAGE_CONF_OPTS="--enable-shared --disable-static"
     48    SAGE_CONF_OPTS="--enable-gmpcompat --enable-cxx=yes --enable-shared --disable-static"
    4849    case $UNAME in
    4950
    5051    SunOS)
     
    7172        fi;;
    7273
    7374    Linux)
     75        # explicitly disable executable stack
     76        LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
     77
    7478        if [ "$SAGE_FAT_BINARY" = "yes" ]; then
    7579           # For now we do the same thing -- namely "--enable-fat" --
    7680           # on both 64-bit and 32-bit, though this is likely to
     
    8892                SAGE_CONF_OPTS=$SAGE_CONF_OPTS" --enable-fat"
    8993           fi 
    9094        fi
    91 
    9295    esac
    9396
    9497    export ABI CFLAGS CXXFLAGS
    9598
    96     ./configure --prefix="$SAGE_LOCAL" --enable-gmpcompat --enable-cxx=yes  $SAGE_CONF_OPTS
     99    ./configure --prefix="$SAGE_LOCAL" $SAGE_CONF_OPTS
    97100    if [ $? -ne 0 ]; then
    98101        echo "Failed to configure."
    99102        exit 1