Ticket #38332: setup.py.patch

setup.py

@@ -30 +30 @@
     'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 
-# If we are on Mac OS 10.5 or later, attempt a universal binary, which is the way
-# the original system version of readline.so was compiled. Set up flags here.
-UNIVERSAL = ''
-platform = distutils.util.get_platform()
-if platform.startswith('macosx'):
-    osx_version = platform.split('-')[1]
-    SDK = ''
-    if osx_version == '10.5':
-        SDK = '/Developer/SDKs/MacOSX10.5.sdk'
-        UNIVERSAL = '-arch i386 -arch ppc -arch x86_64 -arch ppc64'
-    elif osx_version == '10.6':
-        # Starting with 10.6 (Snow Leopard), only Intel architecture is supported
-        SDK = '/Developer/SDKs/MacOSX10.6.sdk'
-        UNIVERSAL = '-arch i386 -arch x86_64'
-    elif osx_version > '10.6':
-        # Starting with 10.7 (Lion) and Xcode 4.3, the developer sysroot is inside the Xcode.app - ignore it
-        UNIVERSAL = '-arch i386 -arch x86_64'
-
-    if os.path.exists(SDK):
-        # only add sysroot if it exists:
-        UNIVERSAL = "-isysroot %s %s" % (SDK, UNIVERSAL)
-
 # Since we have the latest readline (post 4.2), enable all readline functionality
 # These macros can be found in pyconfig.h.in in the main directory of the Python tarball
 DEFINE_MACROS = [
@@ -98 +76 @@
     maintainer_email="ludwig.schwardt@gmail.com; github@srid.name",
     url="http://github.com/ludwigschwardt/python-readline",
     license="GNU GPL",
+    extra_path = 'readline',
     platforms=['MacOS X', 'Posix'],
     include_package_data=True,
     ext_modules=[
@@ -105 +84 @@
                   sources=["Modules/%s.x/readline.c" % (sys.version_info[0],)],
                   include_dirs=['.'],
                   define_macros=DEFINE_MACROS,
-                  extra_compile_args=['-Wno-strict-prototypes'] + UNIVERSAL.split(),
-                  extra_link_args=UNIVERSAL.split(),
+                  extra_compile_args=['-Wno-strict-prototypes'],
                   extra_objects=['readline/libreadline.a', 'readline/libhistory.a'], 
                   libraries=['ncurses']
         ),