haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-10 05:40:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

python: the zlib module wasn't built

Browse Source 
setup.py: /boot/system/develop/headers wasn't added to the include
search paths, so zlib.h wasn't found.
This commit is contained in:
Ingo Weinhold
2013-08-21 15:53:52 +02:00
parent 03dc9fed9b
commit 8bf85116be
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dev-lang/python/patches/python-2.6.8.patch
View File

@@ -559,18 +559,23 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule
diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
--- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200
+++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200
@@ -428,6 +428,10 @@
@@ -428,6 +428,15 @@
inc_dirs += ['/system/include', '/atheos/autolnk/include']
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+ if platform == 'haiku1':
+ inc_dirs += ['/boot/common/non-packaged/develop/headers', '/boot/common/develop/headers', '/boot/system/develop/headers/posix', '/boot/system/develop/headers/3rdparty']
+ lib_dirs += ['/boot/common/non-packaged/develop/lib', '/boot/common/develop/lib', '/boot/system/develop/lib']
+ inc_dirs += ['/boot/common/non-packaged/develop/headers',
+ '/boot/common/develop/headers',
+ '/boot/system/develop/headers/posix',
+ '/boot/system/develop/headers']
+ lib_dirs += ['/boot/common/non-packaged/develop/lib',
+ '/boot/common/develop/lib',
+ '/boot/system/develop/lib']
+
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']
@@ -451,7 +455,7 @@
@@ -451,7 +460,7 @@
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
@@ -579,7 +584,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -694,15 +698,22 @@
@@ -694,15 +703,22 @@
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -605,7 +610,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
['/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
@@ -710,8 +721,8 @@
@@ -710,8 +726,8 @@
if (ssl_incs is not None and
ssl_libs is not None):
exts.append( Extension('_ssl', ['_ssl.c'],
@@ -616,7 +621,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
@@ -746,8 +757,8 @@
@@ -746,8 +762,8 @@
# The _hashlib module wraps optimized implementations
# of hash functions from the OpenSSL library.
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
@@ -627,7 +632,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
libraries = ['ssl', 'crypto']) )
# these aren't strictly missing since they are unneeded.
#missing.extend(['_sha', '_md5'])
@@ -1176,7 +1187,7 @@
@@ -1176,7 +1192,7 @@
missing.append('resource')
# Sun yellow pages. Some systems have the functions in libc.

2
dev-lang/python/python-2.6.8.recipe
View File

@@ -9,7 +9,7 @@ LICENSE="Python"
COPYRIGHT="1990-2012, Python Software Foundation"
SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2"
CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125"
REVISION="4"
REVISION="5"
ARCHITECTURES="x86_gcc2 x86"
PATCHES="python-2.6.8.patch"