Ticket #1085: python.jam.2.patch

File python.jam.2.patch, 1.5 KB (added by chazapis@…, 15 years ago)

Patch to tools/build/v2/tools/python.jam

  • boost_1_33_1/tools/build/v2/tools/python.jam

    old new rule init-unix ( version ? : root ? : in  
    142142
    143143rule init-mac ( version : root : includes ? : libraries ? )
    144144{
     145    # FIXME: root should be optional
    145146    if ! $(root)
    146147    {
    147148        if [ GLOB /System/Library/Frameworks : Python.framework ]
    rule init-mac ( version : root : include  
    153154            root = /Library/Frameworks/Python.framework/Versions/$(version) ;
    154155        }
    155156    }   
    156     includes ?= $(PYTHON_ROOT)/include/python$(PYTHON_VERSION) ;
     157    #includes ?= $(PYTHON_ROOT)/include/python$(PYTHON_VERSION) ;
     158    includes ?= $(root)/include/python$(version) ;
    157159    # FIXME: not sure what PYTHON_FRAMEWORK variable is
    158160    PYTHON_FRAMEWORK ?= $(root) ;
    159161    while $(PYTHON_FRAMEWORK:D=) && $(PYTHON_FRAMEWORK:D=) != Python.framework
    rule init-mac ( version : root : include  
    162164    }
    163165    PYTHON_FRAMEWORK = $(PYTHON_FRAMEWORK:D)/Python ;
    164166
    165     alias python
     167    alias python_for_extensions
    166168      :
    167169      :
    168170      :
    rule init-mac ( version : root : include  
    171173   
    172174    alias python
    173175      :
    174       : <os>MACOSXX <toolset>darwin
     176      : <os>MACOSX <toolset>darwin
    175177      :
    176       : <framework>$(PYTHON_FRAMEWORK)
     178      #: <framework>$(PYTHON_FRAMEWORK)
     179      : <include>$(includes)
     180        <framework>Python
    177181      ; 
    178182}
    179183