Changeset 297

Show
Ignore:
Timestamp:
Wed Dec 13 18:28:14 2006
Author:
giovannibajo
Message:

Merge of [293] from branches/mac:

In [128], Make.py was changed to generate a Makefile which links against
the dynamic library of Python. This looks like a mistake, since the
distribution than depends on libpythonX.X.so.
I changed it back, so that it still uses syconfig to extract the correct
path of the static library. The problem now appears to be that not all
distributions include a static library...

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/source/linux/Make.py

    r275 r297  
    162 162         cflags.append('-DNONELF')  
    163 163  
    164       libs = [os.path.join(binlib, sysconfig.get_config_vars('INSTSONAME')[0])]  
    165   #    libs = [os.path.join(sysconfig.get_config_vars('LIBDIR')[0], sysconfig.get_config_vars('INSTSONAME')[0])]  
    166    
      164     libs = [os.path.join(sysconfig.get_config_vars('LIBPL')[0], sysconfig.get_config_vars('LIBRARY')[0])]  
      165     if not os.path.isfile(libs[0]):  
      166         print "WARNING: could not find Python static library at:", libs[0]  
    167 167  
    168 168     somevars = {}  

  • trunk/doc/CHANGES.txt

    r290 r297  
    18 18  * Bootstrap modules are now compressed in the executable (so that they  
    19 19    are not visible in plaintext by just looking at it with a hex editor).  
      20  * Fixed a regression introduced in 1.1: under Linux, the bootloader does  
      21    not depend on libpythonX.X.so anymore.  
    20 22  
    21 23