diff options
author | cjep <cjep> | 2003-04-13 14:28:53 +0000 |
---|---|---|
committer | cjep <cjep> | 2003-04-13 14:28:53 +0000 |
commit | e2552182a2c858e18cd5e237853902e7722e7597 (patch) | |
tree | 295f76430d4bca186b3a6c19d0d001a8a02ba73a /databases/py-mysqldb/patches/patch-aa | |
parent | d1b78c33e7c8e2a1d81765463b28755e969add7f (diff) | |
download | pkgsrc-e2552182a2c858e18cd5e237853902e7722e7597.tar.gz |
Update of database/py-mysqldb to 0.9.2.
Changes since 0.9.1 include:
* Bugs fixed, including segfault problem with Python 1.5.2
* Take advantage of GC memory allocator in Python 2.2
* cursor.execute(query) with no arguments leaves the original
query string alone.
* Mac OS X tidy ups.
* Memory leak fixes.
* cursor.executemany() fixes.
* Other fixes (see the CHANGELOG file for details)
From PR#19056 from MLH. Note that we assume the client library is
not thread safe as per 0.9.1.
Diffstat (limited to 'databases/py-mysqldb/patches/patch-aa')
-rw-r--r-- | databases/py-mysqldb/patches/patch-aa | 125 |
1 files changed, 64 insertions, 61 deletions
diff --git a/databases/py-mysqldb/patches/patch-aa b/databases/py-mysqldb/patches/patch-aa index fbe4e426d41..f7663f759d8 100644 --- a/databases/py-mysqldb/patches/patch-aa +++ b/databases/py-mysqldb/patches/patch-aa @@ -1,75 +1,78 @@ -$NetBSD: patch-aa,v 1.1 2002/01/29 14:39:39 drochner Exp $ - ---- setup.py.orig Wed Oct 17 05:17:30 2001 -+++ setup.py Tue Jan 29 15:29:27 2002 -@@ -18,53 +18,13 @@ +--- setup.py.orig Thu Jul 18 14:55:36 2002 ++++ setup.py Thu Nov 14 15:36:03 2002 +@@ -11,7 +11,7 @@ + NO = 0 + # set this to YES if you have the thread-safe mysqlclient library +-thread_safe_library = YES ++thread_safe_library = NO + + # You probably don't have to do anything past this point. If you + # do, please mail me the configuration for your platform. Don't +@@ -23,14 +23,10 @@ mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient" --if sys.platform in ("linux-i386", "linux2"): # most Linux -- include_dirs = ['/usr/include/mysql'] -- library_dirs = ['/usr/lib/mysql'] -- libraries = [mysqlclient, "z"] -- runtime_library_dirs = [] -- extra_objects = [] --elif sys.platform in ("freebsd4", "openbsd2"): -- include_dirs = ['/usr/local/include/mysql'] -- library_dirs = ['/usr/local/lib/mysql'] -- libraries = [mysqlclient, "z"] -- runtime_library_dirs = [] -- extra_objects = [] --elif sys.platform == "sunos5": # Solaris 2.8 -- include_dirs = ['/usr/local/mysql/include/mysql'] -- library_dirs = ['/usr/local/mysql/lib/mysql'] -- libraries = [mysqlclient, "z"] -- runtime_library_dirs = ['/usr/local/lib:/usr/openwin/lib:/usr/dt/lib'] -- extra_objects = [] --elif sys.platform == "win32": + # include files and library locations should cover most platforms +-include_dirs = [ +- '/usr/include/mysql', '/usr/local/include/mysql', +- '/usr/local/mysql/include/mysql' +- ] +-library_dirs = [ +- '/usr/lib/mysql', '/usr/local/lib/mysql', +- '/usr/local/mysql/lib/mysql' +- ] ++mysqlprefix = '/usr/pkg' ++mysqlrtprefix = '/usr/pkg' ++include_dirs = [mysqlprefix + '/include/mysql'] ++library_dirs = [mysqlprefix + '/lib/mysql'] + + # MySQL-3.23 and newer need libz + libraries = [mysqlclient, "z"] +@@ -38,7 +34,7 @@ + # On some platorms, this can be used to find the shared libraries + # at runtime, if they are in a non-standard location. Doesn't + # work for Linux gcc. +-runtime_library_dirs = [] ++runtime_library_dirs = [mysqlrtprefix + '/lib/mysql'] + + # This can be used to force linking against static libraries. + extra_objects = [] +@@ -48,38 +44,6 @@ + extra_compile_args = [] + extra_link_args = [] + +-if sys.platform == "netbsd1": +- include_dirs = ['/usr/pkg/include/mysql'] +- library_dirs = ['/usr/pkg/lib/mysql'] +-elif sys.platform in ("freebsd4", "openbsd3"): +- LOCALBASE = os.environ.get('LOCALBASE', '/usr/local') +- include_dirs = ['%s/include/mysql' % LOCALBASE] +- library_dirs = ['%s/lib/mysql' % LOCALBASE] +-elif sys.platform == "sunos5": # Solaris 2.8 + gcc +- runtime_library_dirs.append('/usr/local/lib:/usr/openwin/lib:/usr/dt/lib') +- extra_compile_args.append("-fPIC") +-elif sys.platform == "win32": # Ugh - include_dirs = [r'c:\mysql\include'] - library_dirs = [r'c:\mysql\lib\opt'] - libraries = [mysqlclient, 'zlib', 'msvcrt', 'libcmt', - 'wsock32', 'advapi32'] -- runtime_library_dirs = [] - extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib'] --elif sys.platform == "darwin1": # Mac OS X -- include_dirs = ['/usr/local/mysql/include/mysql'] -- library_dirs = ['/usr/local/mysql/lib/mysql'] -- libraries = [mysqlclient, "z"] -- runtime_library_dirs = [] -- extra_objects = [] --elif os.name == "posix": # most Linux/UNIX platforms -- include_dirs = ['/usr/include/mysql'] -- library_dirs = ['/usr/lib/mysql'] -- # MySQL-3.23 needs libz -- libraries = [mysqlclient, "z"] -- # On some platorms, this can be used to find the shared libraries -- # at runtime, if they are in a non-standard location. Doesn't -- # work for Linux gcc. -- ## runtime_library_dirs = library_dirs -- runtime_library_dirs = [] -- # This can be used on Linux to force use of static mysqlclient lib -- ## extra_objects = ['/usr/lib/mysql/libmysqlclient.a'] -- extra_objects = [] +-elif sys.platform == "cygwin": +- include_dirs = ['/c/mysql/include'] +- library_dirs = ['/c/mysql/lib'] +- extra_compile_args.append('-DMS_WIN32') +-elif sys.platform[:6] == "darwin": # Mac OS X +- include_dirs.append('/sw/include') +- library_dirs.append('/sw/lib') +- extra_link_args.append('-flat_namespace') +-elif sys.platform == 'linux2' and os.environ.get('HOSTTYPE') == 'alpha': +- libraries.extend(['ots', 'cpml']) +-elif os.name == "posix": # UNIX-ish platforms not covered above +- pass # default should work -else: - raise "UnknownPlatform", "sys.platform=%s, os.name=%s" % \ - (sys.platform, os.name) -+mysqlprefix = '@MYSQLPREFIX@' -+mysqlrtprefix = '@MYSQLRTPREFIX@' -+include_dirs = [mysqlprefix + '/include/mysql'] -+library_dirs = [mysqlprefix + '/lib/mysql'] -+libraries = [mysqlclient, "z"] -+runtime_library_dirs = [mysqlrtprefix + '/lib/mysql'] -+extra_objects = [] - +- long_description = \ """Python interface to MySQL-3.23 -@@ -93,7 +53,8 @@ - author = "Andy Dustman", - author_email = "andy@dustman.net", - license = "GPL", -- platforms = "ALL", -+# "platforms" doesn't work for Python 2.0.x -+# platforms = "ALL", - url = "http://sourceforge.net/projects/mysql-python", - # Description of the modules and packages in the distribution |