Ticket #9472: polybori-0.6.4.p1-p2.patch

File polybori-0.6.4.p1-p2.patch, 5.2 KB (added by leif, 12 years ago)

Apply to polybori-0.6.4.p1. Source trees have to be removed manually.

  • SPKG.txt

    # HG changeset patch
    # User Leif Leonhardy <not.really@online.de>
    # Date 1278791098 -7200
    # Node ID def695f9a5a7443fc0769d1e833e75b426934628
    # Parent  3a165f68b2442ee02fe6dc18be2d1e6c67280e2e
    Removed BOOST and M4RI source; minor fixes in spkg-install and patches/custom.py
    
    === polybori-0.6.4.p2 (Leif Leonhardy, July 10th, 2010) ===
     * Removed Michael Abshoff from maintainer list (see #7738)
     * Deleted Boost source tree again since it was split off into a separate
       spkg (see below, 0.5.rc.p7), modified spkg-install accordingly
     * Deleted M4RI source tree, because it is a standard Sage package
     * Little clean-up and minor fixes in patches/custom.py
       - Note that CFLAGS etc. are still *overwritten* rather than modified!
     * Updated "Dependencies" section above
    
    diff -r 3a165f68b244 -r def695f9a5a7 SPKG.txt
    a b  
    1515==Maintainers ==
    1616
    1717 * Tim Abbott
    18  * Michael Abshoff
    1918 * Martin Albrecht
    2019 * Burcin Eröcal
    2120
     
    3130 * Python
    3231 * Scons
    3332 * Boost
     33 * gd (FIXME/TODO: should be added to deps, I think. Leif, 2010-07-10)
     34 * M4RI/libm4ri (already included in deps)
     35 * png/libpng12 (accomplished because Python and gd depend on it, too)
     36 * libz         (accomplished because e.g. libpng depends on it)
    3437
    3538== Releases ==
    3639
     40=== polybori-0.6.4.p2 (Leif Leonhardy, July 10th, 2010) ===
     41 * Removed Michael Abshoff from maintainer list (see #7738)
     42 * Deleted Boost source tree again since it was split off into a separate
     43   spkg (see below, 0.5.rc.p7), modified spkg-install accordingly
     44 * Deleted M4RI source tree, because it is a standard Sage package
     45 * Little clean-up and minor fixes in patches/custom.py
     46   - Note that CFLAGS etc. are still *overwritten* rather than modified!
     47 * Updated "Dependencies" section above
     48
    3749=== polybori-0.6.4.p1 (Mike Hansen, May 26th, 2010) ===
    3850 * Added a patch to make PolyBoRi build on Cygwin (#7337)
    3951
     
    4254 * removed obsolete patches (SConstruct, cpu_stats.c)
    4355 * removed obsolete work arounds (delete shared libraries and touch pbori.pyx)
    4456
    45 
    4657=== polybori-0.6.3-r1647-20091028 (Martin Albrecht, October 29th, 2009) ===
    4758 * upgraded to current mercurial tip (which did pass the PolyBoRi testsuite last night)
    4859
  • patches/custom.py

    diff -r 3a165f68b244 -r def695f9a5a7 patches/custom.py
    a b  
    11import os
    22import sys
    33
     4# FIXME: Do we really want to *overwrite* the flags (e.g. if set by the user)?
    45CCFLAGS=["-O3 -Wno-long-long -Wreturn-type -g -fPIC"]
    5 CXXFLAGS=CCFLAGS+["-ftemplate-depth-100 -g -fPIC"]
     6#CXXFLAGS=CCFLAGS+["-ftemplate-depth-100 -g -fPIC"]
     7CXXFLAGS=CCFLAGS+["-ftemplate-depth-100"]
     8
     9# FIXME: Should we include LDFLAGS here? (see above)
     10if not globals().has_key("LINKFLAGS"): LINKFLAGS=[] # s.t. we can *append* below
     11
    612
    713if sys.platform=='darwin':
    814    FORCE_HASH_MAP=True
    915   
    1016
    11 if os.environ.has_key('SAGE_DEBUG'):
     17if os.environ.get('SAGE_DEBUG', "no") == "yes":
    1218    CPPDEFINES=[]
    13     CCFLAGS=[" -pg"] + CCFLAGS
    14     CXXFLAGS=[" -pg"] + CXXFLAGS
    15     LINKFLAGS=[" -pg"]
     19    CCFLAGS=["-pg"] + CCFLAGS
     20    CXXFLAGS=["-pg"] + CXXFLAGS
     21    # LINKFLAGS=["-pg"]
     22    LINKFLAGS=["-pg"] + LINKFLAGS
    1623
    17 if os.environ['SAGE64'] == "yes":
    18     print "64 bit OSX build"
    19     CCFLAGS=[" -m64"] + CCFLAGS
    20     CXXFLAGS=[" -m64"] + CXXFLAGS
    21     LINKFLAGS=[" -m64"]
     24if os.environ.get('SAGE64', "no") == "yes":
     25    print "Building a 64-bit version of PolyBoRi"
     26    CCFLAGS=["-m64"] + CCFLAGS
     27    CXXFLAGS=["-m64"] + CXXFLAGS
     28    # LINKFLAGS=["-m64"]
     29    LINKFLAGS=["-m64"] + LINKFLAGS
    2230
     31# (BOOSTINCDIR is set and now exported in spkg-install:)
    2332CPPPATH=[os.environ['BOOSTINCDIR']]+[os.environ['SAGE_LOCAL']+"/include"]
    2433PYPREFIX=os.environ['PYTHONHOME']
    2534PBP=os.environ['PYTHONHOME']+'/bin/python'
     
    3241HAVE_PYTHON_EXTENSION=False
    3342EXTERNAL_PYTHON_EXTENSION=True
    3443
     44# (CC and CXX should have been set by sage-env, but never mind...:)
    3545try:
    3646  CC = os.environ['CC']
    3747except:
  • spkg-install

    diff -r 3a165f68b244 -r def695f9a5a7 spkg-install
    a b  
    1414# make install failures, so copy it over.
    1515#mkdir src/boost_1_34_1.cropped
    1616#cp -r $SAGE_LOCAL/include/boost src/boost_1_34_1.cropped
    17 BOOSTDIR=boost_1_34_1.cropped
     17
     18#BOOSTDIR=boost_1_34_1.cropped  # obsolete, only used by spkg-install
     19#BOOSTINCDIR=${WORKDIR}/${BOOSTDIR}
     20BOOSTINCDIR=${SAGE_LOCAL}/include/boost # we now only use that; Boost is a standard spkg
     21export BOOSTINCDIR # used by scons
    1822
    1923patch()
    2024{
     
    3236build_polybori()
    3337{
    3438    cd ${PBDIR}
    35     BOOSTINCDIR=${WORKDIR}/${BOOSTDIR} ${SCONS} prepare-devel ${MAKEOPTS}
     39    ${SCONS} prepare-devel ${MAKEOPTS}
    3640    if [ $? -ne 0 ]; then
    3741        echo "Error building PolyBoRi."
    3842        exit 1
     
    4347install_polybori()
    4448{
    4549    cd ${PBDIR}
    46     BOOSTINCDIR=${WORKDIR}/${BOOSTDIR} ${SCONS} devel-install install PREFIX=${SAGE_LOCAL} INSTALLDIR=${SAGE_LOCAL}/share/polybori
     50    ${SCONS} devel-install install PREFIX=${SAGE_LOCAL} INSTALLDIR=${SAGE_LOCAL}/share/polybori
    4751    if [ $? -ne 0 ]; then
    4852        echo "Error installing PolyBoRi."
    4953        exit 1