summarylogtreecommitdiffstats
path: root/use_system_wcstools.patch
blob: 9a77f1e14b168db56c489095e201d2059bcb78ba (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
From: Ole Streicher <olebole@debian.org>
Date: Tue, 27 Jun 2017 22:03:46 +0200
Subject: Use system provided libwcstools instead of local copy

Also, build the swig wrapper from its source file.
---
 PyWCSTools/wcssubs-3.9.7/wcs.i    | 2 +-
 PyWCSTools/wcssubs-3.9.7/wcscon.i | 4 ++++
 setup.py                          | 9 ++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PyWCSTools/wcssubs-3.9.7/wcs.i b/PyWCSTools/wcssubs-3.9.7/wcs.i
index e63c5ba..2860834 100644
--- a/PyWCSTools/wcssubs-3.9.7/wcs.i
+++ b/PyWCSTools/wcssubs-3.9.7/wcs.i
@@ -14,7 +14,7 @@
 /* %feature("autodoc", "1") */
 
 %{
-#include "wcs.h"
+#include <wcs/wcs.h>
 %}
 
 /* WORKING */
diff --git a/PyWCSTools/wcssubs-3.9.7/wcscon.i b/PyWCSTools/wcssubs-3.9.7/wcscon.i
index 3bbee55..e9f30ab 100644
--- a/PyWCSTools/wcssubs-3.9.7/wcscon.i
+++ b/PyWCSTools/wcssubs-3.9.7/wcscon.i
@@ -7,6 +7,10 @@
 
 %include "typemaps.i"
 
+%{
+#include <wcs/wcs.h>
+%}
+
 // %apply double *OUTPUT {double *dtheta, double *dphi, double *ptheta, double *pphi};
 // void wcsconp (int sys1, int sys2, double eq1, double eq2, double ep1, double ep2, double *dtheta, double *dphi, double *ptheta, double *pphi);
 // void wcsconp (int sys1, int sys2, double eq1, double eq2, double ep1, double ep2, double *dtheta, double *dphi, double *ptheta, double *pphi);
diff --git a/setup.py b/setup.py
index 279f7a4..b6135a0 100644
--- a/setup.py
+++ b/setup.py
@@ -59,12 +59,11 @@ setup(name='astLib',
     version='0.12.0',
     packages=['astLib', 'PyWCSTools'],
     package_data={'astLib': ['data/*']},
-    cmdclass={"build_ext": build_PyWCSTools_ext},
     scripts=exampleScripts,
     ext_modules=[
-        # Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
-        # extra_objects=oFiles),
-        Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
-        extra_objects=oFiles)
+        # Extension('PyWCSTools._wcscon', [sourceDir+"wcscon.i"],
+        # swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools']),
+        Extension('PyWCSTools._wcs', [sourceDir+"wcs.i"],
+        swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools'])
     ]
 	)