Sophie

Sophie

distrib > Mageia > 9 > armv7hl > by-pkgid > 829274e8a18dc6ee644b7130519ac05e > files > 1

montage-6.0-4.mga9.src.rpm

From: Ole Streicher <olebole@debian.org>
Date: Fri, 18 Jan 2019 16:44:53 +0100
Subject: Fix python setup script

 * Don't install standard font file
 * Remove specification of arch, CC, CFLAGS
 * add required libraries
---
 python/MontagePy/setup_manylinux.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/python/MontagePy/setup_manylinux.py b/python/MontagePy/setup_manylinux.py
index a22f446..df51f76 100644
--- a/python/MontagePy/setup_manylinux.py
+++ b/python/MontagePy/setup_manylinux.py
@@ -11,13 +11,10 @@ objs = []
 for obj in os.listdir("lib"):
     objs.append("lib/" + obj)
 
-os.environ['CC'] = 'gcc'
-os.environ['CFLAGS'] = ''
-os.environ['ARCHFLAGS'] = '-arch x86_64'
-
 extensions = [
     Extension("MontagePy._wrappers", ["MontagePy/_wrappers.pyx"],
         include_dirs = [os.path.join(LIB, 'include'), os.path.join(LIB, 'src', 'bzip2-1.0.6'), MONTAGELIB],
+        libraries = ['cfitsio', 'wcstools', 'jpeg', 'freetype'],
         extra_objects = objs),
     Extension("MontagePy.main", ["MontagePy/main.pyx"],
         include_dirs = [os.path.join(LIB, 'include'), MONTAGELIB])
@@ -34,7 +31,6 @@ setup(
     keywords = 'astronomy astronomical image reprojection mosaic visualization',
     url = 'https://github.com/Caltech-IPAC/Montage',
     packages = ['MontagePy'],
-    package_data = { 'MontagePy': ['FreeSans.ttf'] },
     ext_modules = cythonize(extensions),
     install_requires = ['requests']
 )