Ticket #32706: pyodbc-2.1.11.patch

File pyodbc-2.1.11.patch, 2.4 KB (added by bpanulla (Brian Panulla), 12 years ago)

Full unified patch of the change relative to current MacPorts trunk.

  • home/macports/python/py27-odbc/Portfile 

    # HG changeset patch
# User bpanulla@eebc5948-5d07-4822-aef8-632c6929fb8b
# Date 2011-12-30 12:09:36 -0800
# Node ID 0d0361871a2de590fd2631b1cc6cf19afc750a9e
# Parent  b63347da9f9d1eb3d543c4c42b4928292ac704f9
Upgraded to pyodbc 2.1.11 and fixed library path issues on OS X 10.7.

diff --git a/home/macports/python/py27-odbc/Portfile b/home/macports/python/py27-odbc/Portfile
    a b  
    44PortGroup           python27 1.0
    55
    66name                py27-odbc
    7 revision            1
    87set real_name       pyodbc
    9 version             2.1.8
     8version             2.1.11
    109categories-append   databases devel
    1110platforms           darwin
    1211license             MIT
    … …  
    2019master_sites        http://${real_name}.googlecode.com/files/
    2120distname            ${real_name}-${version}
    2221use_zip             yes
    23 checksums           md5     7c9cfbb21afd65fb20bab127dc579c93 \
    24                     sha1    3b2a066a609f920225987ed18dfcbed95704a4bf \
    25                     rmd160  7bca24bf603f840c2f3253909254bc46a1fd3c92
     22checksums           md5     f8f62b725fbd88f4ba5bca288ae7d697 \
     23                    sha1    df7c4aeca8e0ef96af83c51c7ff8c44ef361cc67 \
     24                    rmd160  3d8a78ff4a9a24cb2810dbb24f41c04e07bf0b1c
    2625patchfiles          setup.py.patch
    2726depends_lib-append  port:unixODBC

  • home/macports/python/py27-odbc/files/setup.py.patch 

    diff --git a/home/macports/python/py27-odbc/files/setup.py.patch b/home/macports/python/py27-odbc/files/setup.py.patch
    a b  
    1 --- setup.py.orig       2011-02-10 11:56:51.000000000 -0500
    2 +++ setup.py    2011-02-10 11:57:32.000000000 -0500
    3 @@ -52,10 +52,6 @@
    4          # OS name not windows, but still on Windows
    5          libraries.append('odbc32')
     1--- setup.py.orig       Fri Dec 30 11:04:36 2011 -0800
     2+++ setup.py    Fri Dec 30 11:06:45 2011 -0800
     3@@ -132,8 +132,9 @@
     4         settings['libraries'].append('odbc32')
    65 
    7 -    elif sys.platform == 'darwin':
     6     elif sys.platform == 'darwin':
    87-        # OS/X now ships with iODBC.
    9 -        libraries.append('iodbc')
    10 -
     8-        settings['libraries'].append('iodbc')
     9+        settings['libraries'].append('odbc')
     10+        settings['include_dirs'] = ['/opt/local/include']
     11+        settings['library_dirs'] = ['/opt/local/lib']
     12 
    1113     else:
    1214         # Other posix-like: Linux, Solaris, etc.
    13