mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
0b25624891
The build succeeds on i686-linux. Other platforms look good, too, because there were hardly any changes necessary to update the expression from 2.5. svn path=/nixpkgs/trunk/; revision=17889
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
|
|
*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200
|
|
--- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200
|
|
***************
|
|
*** 279,288 ****
|
|
# Check for AtheOS which has libraries in non-standard locations
|
|
if platform == 'atheos':
|
|
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
|
|
- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
|
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
|
- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
|
|
|
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
|
if platform in ['osf1', 'unixware7', 'openunix8']:
|
|
lib_dirs += ['/usr/ccs/lib']
|
|
--- 279,289 ----
|
|
# Check for AtheOS which has libraries in non-standard locations
|
|
if platform == 'atheos':
|
|
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
|
|
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
|
|
|
+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
|
+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
|
+
|
|
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
|
if platform in ['osf1', 'unixware7', 'openunix8']:
|
|
lib_dirs += ['/usr/ccs/lib']
|