diff options
| author | David Naylor <dbn@FreeBSD.org> | 2013-12-17 20:51:59 +0000 |
|---|---|---|
| committer | David Naylor <dbn@FreeBSD.org> | 2013-12-17 20:51:59 +0000 |
| commit | 127a93439fa631f39747545bba96f4333459e533 (patch) | |
| tree | a5237bbbd38dcce2e052e2a830de2e6696f6a461 /lang/pypy-devel/files/patch-lib_pypy___sqlite3.py | |
| parent | - Update to 0.50 (diff) | |
Update lang/pypy-devel to development snapshot at 16-Dec-'13.
Changes:
1) Fix installation with LOCALBASE!=/usr/local
2) Properly detect the number of CPUs for concurrent builds
Notes:
1) The cffi based module _sqlite3.py needs to know where to find
sqlite3.h, which is hard-coded into the file, however the '.so'
created is based on the checksum of _sqlite3.py that changes
when changing the hard-coded path. Change this by properly
using the LOCALBASE environment variable.
2) This change does not modify the behaviour of the port as this
port runs the compilation stage directly, and correctly, however
this change will be upstreamed.
Notes
Notes:
svn path=/head/; revision=336767
Diffstat (limited to 'lang/pypy-devel/files/patch-lib_pypy___sqlite3.py')
| -rw-r--r-- | lang/pypy-devel/files/patch-lib_pypy___sqlite3.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py b/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py index 6cb5a0c53265..5a8650d0f7b6 100644 --- a/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py +++ b/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py @@ -1,11 +1,19 @@ ---- lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200 -+++ lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200 -@@ -270,7 +270,7 @@ +--- lib_pypy/_sqlite3.py.bak 2013-12-15 23:45:52.000000000 +0200 ++++ lib_pypy/_sqlite3.py 2013-12-16 12:07:57.000000000 +0200 +@@ -269,11 +269,14 @@ + _ffi.cdef("int sqlite3_enable_load_extension(sqlite3 *db, int onoff);") - _lib = _ffi.verify(""" - #include <sqlite3.h> --""", libraries=['sqlite3'] -+""", libraries=['sqlite3'], include_dirs=['/usr/local/include'], library_dirs=['/usr/local/lib'] - ) - - exported_sqlite_symbols = [ + if sys.platform.startswith('freebsd'): ++ import os ++ import os.path ++ _localbase = os.environ.get('LOCALBASE', '/usr/local') + _lib = _ffi.verify(""" + #include <sqlite3.h> + """, libraries=['sqlite3'], +- include_dirs=['/usr/local/include'], +- library_dirs=['/usr/local/lib'] ++ include_dirs=[os.path.join(_localbase, 'include')], ++ library_dirs=[os.path.join(_localbase, 'lib')] + ) + else: + _lib = _ffi.verify(""" |