Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | Do not compute platform, this does not work in cross compile environment |
| 2 | since it pokes at the system for getting architecture values |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 6 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 7 | Index: M2Crypto-0.30.1/setup.py |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 8 | =================================================================== |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 9 | --- M2Crypto-0.30.1.orig/setup.py |
| 10 | +++ M2Crypto-0.30.1/setup.py |
| 11 | @@ -160,22 +160,6 @@ class _M2CryptoBuildExt(build_ext.build_ |
| 12 | log.debug('self.include_dirs = %s', self.include_dirs) |
| 13 | log.debug('self.library_dirs = %s', self.library_dirs) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 15 | - if platform.system() == "Linux": |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | - # For RedHat-based distros, the '-D__{arch}__' option for |
| 17 | - # Swig needs to be normalized, particularly on i386. |
| 18 | - mach = platform.machine().lower() |
| 19 | - if mach in ('i386', 'i486', 'i586', 'i686'): |
| 20 | - arch = '__i386__' |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 21 | - elif mach in ('ppc64', 'powerpc64', 'ppc64le', 'ppc64el'): |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | - arch = '__powerpc64__' |
| 23 | - elif mach in ('ppc', 'powerpc'): |
| 24 | - arch = '__powerpc__' |
| 25 | - else: |
| 26 | - arch = '__%s__' % mach |
| 27 | - self.swig_opts.append('-D%s' % arch) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 28 | - if mach in ('ppc64le', 'ppc64el'): |
| 29 | - self.swig_opts.append('-D_CALL_ELF=2') |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 30 | - |
| 31 | self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 32 | |
| 33 | # Some Linux distributor has added the following line in |