1 |
commit: 0d20370b58e83f8f707aedf74c5fc04bc2414652 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 6 21:29:43 2017 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 6 21:31:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d20370b |
7 |
|
8 |
sci-astronomy/casacore: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
sci-astronomy/casacore/Manifest | 2 +- |
13 |
...casacore-2.0.3.ebuild => casacore-2.3.0.ebuild} | 38 ++-- |
14 |
...-class-and-collaboration-graph-generation.patch | 43 ++++ |
15 |
...asacore-2.3.0-disable-known-test-failures.patch | 158 +++++++++++++ |
16 |
....0-disable-tests-that-require-data-tables.patch | 253 +++++++++++++++++++++ |
17 |
...nstall-test-and-demonstration-executables.patch | 34 +++ |
18 |
...sticsUtilities-tLatticeStatistics-and-tLC.patch | 162 +++++++++++++ |
19 |
...ll-int-type-for-memory-on-32-bit-machines.patch | 77 +++++++ |
20 |
...e-2.3.0-loose-some-tests-tFFTServer-tests.patch | 36 +++ |
21 |
...the-check-for-NFS-a-bit-more-portable-BSD.patch | 60 +++++ |
22 |
...use-the-correct-symbol-to-detect-Linux-OS.patch | 22 ++ |
23 |
11 files changed, 870 insertions(+), 15 deletions(-) |
24 |
|
25 |
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest |
26 |
index 0584fd74d32..c940c394f98 100644 |
27 |
--- a/sci-astronomy/casacore/Manifest |
28 |
+++ b/sci-astronomy/casacore/Manifest |
29 |
@@ -1,2 +1,2 @@ |
30 |
-DIST casacore-2.0.3.tar.gz 7250964 SHA256 44746633113e16f8daabb38c404d2b316b1acfd9304a4df91cb1849d2786d726 SHA512 f434e52cfd2903730c18857126c11eb4fbfe5f7a0555d82f423562d6f41c682262c7bf4775954b16ed60d872a067fc5495ac9aaa17deb9555381436b1a26c741 WHIRLPOOL 8836a27f07f231d676879c69504a32dbd893092a9378ac259698ffe07ee050cedb24dd298b38e4ef86b1c6ea4fac42e9941cd6e9317cf1d404da897c34b6866f |
31 |
DIST casacore-2.1.0.tar.gz 10173155 SHA256 9c0017e741c1c4b14bc09582867910f750cd76ff2673e0ecd554aa5b2db7acb4 SHA512 ab52bed9ebc5aef79c7b46c963c90fe9db2e7bac82249f99ed0def2496065ae337cdd9359fb9a6c0182fc3faa702f476116bf0edffc54585a3353a43ce6ddd9f WHIRLPOOL cda1fba87a02d5564a3f56c93eaad2c674bc7f8795d4bd56152549174405cd761ef1df5a00d27ebd0d2bf37fe663b17bbd961508607d1a39e1c494795f6fa755 |
32 |
+DIST casacore-2.3.0.tar.gz 10326408 SHA256 d8ed5373f5447885be6d3aac72f26cee24a662df5caf4a6cd23e846b79181700 SHA512 48d09e74b0c3885eb9f7bd048f0fd158397f7c6aa2bf9f713af9dbfcf3ce2c5ba0abb9500d3fe1d32977a35e0941b273fbfd8ee69c991a19df264f5f5a28cbb0 WHIRLPOOL c343a6d419e2e39b888141768abba2c7432e58a8751311e70edd856feb71e4ebcd854ea6e47d72505493bc368d022019178b7dd51c7544f725b332b06f521a00 |
33 |
|
34 |
diff --git a/sci-astronomy/casacore/casacore-2.0.3.ebuild b/sci-astronomy/casacore/casacore-2.3.0.ebuild |
35 |
similarity index 60% |
36 |
rename from sci-astronomy/casacore/casacore-2.0.3.ebuild |
37 |
rename to sci-astronomy/casacore/casacore-2.3.0.ebuild |
38 |
index 6742a90e715..60732fa5e8d 100644 |
39 |
--- a/sci-astronomy/casacore/casacore-2.0.3.ebuild |
40 |
+++ b/sci-astronomy/casacore/casacore-2.3.0.ebuild |
41 |
@@ -3,10 +3,9 @@ |
42 |
|
43 |
EAPI=6 |
44 |
|
45 |
-# python3 is experimental and only one python is supported |
46 |
-PYTHON_COMPAT=( python2_7 ) |
47 |
+PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
48 |
|
49 |
-inherit cmake-utils eutils toolchain-funcs fortran-2 python-single-r1 |
50 |
+inherit cmake-utils eutils toolchain-funcs fortran-2 python-r1 |
51 |
|
52 |
DESCRIPTION="Core libraries for the Common Astronomy Software Applications" |
53 |
HOMEPAGE="https://github.com/casacore/casacore" |
54 |
@@ -22,8 +21,8 @@ RDEPEND=" |
55 |
sci-astronomy/wcslib:0= |
56 |
sci-libs/cfitsio:0= |
57 |
sys-libs/readline:0= |
58 |
- virtual/blas |
59 |
- virtual/lapack |
60 |
+ virtual/blas:= |
61 |
+ virtual/lapack:= |
62 |
data? ( sci-astronomy/casa-data ) |
63 |
fftw? ( sci-libs/fftw:3.0= ) |
64 |
hdf5? ( sci-libs/hdf5:0= ) |
65 |
@@ -31,24 +30,37 @@ RDEPEND=" |
66 |
${PYTHON_DEPS} |
67 |
dev-libs/boost:0=[python,${PYTHON_USEDEP}] |
68 |
dev-python/numpy[${PYTHON_USEDEP}] |
69 |
- )" |
70 |
+ ) |
71 |
+" |
72 |
DEPEND="${RDEPEND} |
73 |
virtual/pkgconfig |
74 |
doc? ( app-doc/doxygen ) |
75 |
- test? ( sci-astronomy/casa-data )" |
76 |
+ test? ( sci-astronomy/casa-data ) |
77 |
+" |
78 |
+ |
79 |
+PATCHES=( |
80 |
+ "${FILESDIR}"/${PN}-2.3.0-disable-class-and-collaboration-graph-generation.patch |
81 |
+ "${FILESDIR}"/${PN}-2.3.0-disable-known-test-failures.patch |
82 |
+ "${FILESDIR}"/${PN}-2.3.0-disable-tests-that-require-data-tables.patch |
83 |
+ "${FILESDIR}"/${PN}-2.3.0-do-not-install-test-and-demonstration-executables.patch |
84 |
+ "${FILESDIR}"/${PN}-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch |
85 |
+ "${FILESDIR}"/${PN}-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch |
86 |
+ "${FILESDIR}"/${PN}-2.3.0-loose-some-tests-tFFTServer-tests.patch |
87 |
+ "${FILESDIR}"/${PN}-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch |
88 |
+ "${FILESDIR}"/${PN}-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch |
89 |
+) |
90 |
|
91 |
pkg_pretend() { |
92 |
if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then |
93 |
use c++11 && [[ $(gcc-major-version) -lt 4 ]] || \ |
94 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \ |
95 |
- die "You are using gcc but gcc-4.7 or higher is required for C++11" |
96 |
- use openmp && ! tc-has-openmp && \ |
97 |
- die "You are using gcc but without OpenMP capabilities that you requested" |
98 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \ |
99 |
+ die "You are using gcc but gcc-4.7 or higher is required for C++11" |
100 |
fi |
101 |
+ use openmp && tc-check-openmp |
102 |
} |
103 |
|
104 |
pkg_setup() { |
105 |
- use python && python-single-r1_pkg_setup |
106 |
+ use python && python-r1_pkg_setup |
107 |
fortran-2_pkg_setup |
108 |
} |
109 |
|
110 |
@@ -78,8 +90,6 @@ src_compile() { |
111 |
|
112 |
src_install(){ |
113 |
cmake-utils_src_install |
114 |
- # conflict, bug #575726 (gone in version > 2.0.4) |
115 |
- mv "${ED}"usr/bin/show{,casa}table || die |
116 |
if use doc; then |
117 |
insinto /usr/share/doc/${PF} |
118 |
doins -r doc/html |
119 |
|
120 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch |
121 |
new file mode 100644 |
122 |
index 00000000000..d06af1e6e31 |
123 |
--- /dev/null |
124 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch |
125 |
@@ -0,0 +1,43 @@ |
126 |
+From: Benda Xu <heroxbd@g.o> |
127 |
+Date: Thu, 11 Sep 2014 18:20:44 +0900 |
128 |
+Subject: Disable class and collaboration graph generation |
129 |
+ |
130 |
+The graphviz-generated class and collaboration graph |
131 |
+occupies 1GB disk space. It is too big to deal with. We turn them |
132 |
+off only to save space. Output image format is specified as svg to |
133 |
+further save space (bug #751947). |
134 |
+--- |
135 |
+ doxygen.cfg | 6 +++--- |
136 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
137 |
+ |
138 |
+diff --git a/doxygen.cfg b/doxygen.cfg |
139 |
+index 9071e88..94b7ccb 100644 |
140 |
+--- a/doxygen.cfg |
141 |
++++ b/doxygen.cfg |
142 |
+@@ -2103,7 +2103,7 @@ DOT_FONTPATH = |
143 |
+ # The default value is: YES. |
144 |
+ # This tag requires that the tag HAVE_DOT is set to YES. |
145 |
+ |
146 |
+-CLASS_GRAPH = YES |
147 |
++CLASS_GRAPH = NO |
148 |
+ |
149 |
+ # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a |
150 |
+ # graph for each documented class showing the direct and indirect implementation |
151 |
+@@ -2112,7 +2112,7 @@ CLASS_GRAPH = YES |
152 |
+ # The default value is: YES. |
153 |
+ # This tag requires that the tag HAVE_DOT is set to YES. |
154 |
+ |
155 |
+-COLLABORATION_GRAPH = YES |
156 |
++COLLABORATION_GRAPH = NO |
157 |
+ |
158 |
+ # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for |
159 |
+ # groups, showing the direct groups dependencies. |
160 |
+@@ -2215,7 +2215,7 @@ DIRECTORY_GRAPH = NO |
161 |
+ # The default value is: png. |
162 |
+ # This tag requires that the tag HAVE_DOT is set to YES. |
163 |
+ |
164 |
+-DOT_IMAGE_FORMAT = png |
165 |
++DOT_IMAGE_FORMAT = svg |
166 |
+ |
167 |
+ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to |
168 |
+ # enable generation of interactive SVG images that allow zooming and panning. |
169 |
|
170 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch |
171 |
new file mode 100644 |
172 |
index 00000000000..c26619f28c2 |
173 |
--- /dev/null |
174 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch |
175 |
@@ -0,0 +1,158 @@ |
176 |
+From: Ole Streicher <olebole@××××××.org> |
177 |
+Date: Fri, 2 Dec 2016 11:11:28 +0100 |
178 |
+Subject: Disable known test failures |
179 |
+MIME-Version: 1.0 |
180 |
+Content-Type: text/plain; charset="utf-8" |
181 |
+Content-Transfer-Encoding: 8bit |
182 |
+ |
183 |
+Disable tPath test |
184 |
+ |
185 |
+sbuild gets HOME variable leaked into the build environment. Debian |
186 |
+uses sbuild as official build farm. Until the cause is pinned down, |
187 |
+this test is disabled. |
188 |
+ |
189 |
+ 98/425 Test #101: tPath ...............................***Failed 0.64 sec |
190 |
+1,16d0 |
191 |
+< expanded: /home/heroxbd |
192 |
+< expected: /«PKGBUILDDIR» |
193 |
+< absolute: /home/heroxbd |
194 |
+< expected: /«PKGBUILDDIR» |
195 |
+< expanded: /home/heroxbd/test/test2 |
196 |
+< expected: /«PKGBUILDDIR»/test/test2 |
197 |
+< absolute: /home/heroxbd/test/test2 |
198 |
+< expected: /«PKGBUILDDIR»/test/test2 |
199 |
+< expanded: /home/heroxbd/test |
200 |
+< expected: /«PKGBUILDDIR»/test |
201 |
+< absolute: /home/heroxbd/test |
202 |
+< expected: /«PKGBUILDDIR»/test |
203 |
+< expanded: /home/heroxbd/test |
204 |
+< expected: /«PKGBUILDDIR»/test |
205 |
+< absolute: /home/heroxbd/test |
206 |
+< expected: /«PKGBUILDDIR»/test |
207 |
+33a18 |
208 |
+> OK |
209 |
+FAIL (output not verified): ./tPath |
210 |
+ |
211 |
+Disable tLSQaips and tLSQFit tests |
212 |
+ |
213 |
+These tests fail, probably due to the test itself. From |
214 |
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838424#15 |
215 |
+ |
216 |
+I'm not sure what to do about the other two tests that fail on arm64, |
217 |
+"tLSQaips" and "tLSQFit", because those two generate a load of output |
218 |
+text containing floating-point numbers and compare that text with an |
219 |
+expected output. It might not be so easy to make that work on all |
220 |
+architectures. Perhaps one could simply disable those two tests. |
221 |
+Preferably one would still run them, so that we can see what happens |
222 |
+in the logs, but not have the build fail if only those tests fail. |
223 |
+--- |
224 |
+ casa/IO/test/CMakeLists.txt | 4 ++-- |
225 |
+ casa/OS/test/CMakeLists.txt | 9 ++++----- |
226 |
+ images/Images/test/CMakeLists.txt | 2 +- |
227 |
+ lattices/LatticeMath/test/CMakeLists.txt | 2 +- |
228 |
+ scimath/Fitting/test/CMakeLists.txt | 4 ++-- |
229 |
+ tables/TaQL/test/CMakeLists.txt | 4 ++-- |
230 |
+ 6 files changed, 12 insertions(+), 13 deletions(-) |
231 |
+ |
232 |
+diff --git a/casa/IO/test/CMakeLists.txt b/casa/IO/test/CMakeLists.txt |
233 |
+index 188a6c4..3187b60 100644 |
234 |
+--- a/casa/IO/test/CMakeLists.txt |
235 |
++++ b/casa/IO/test/CMakeLists.txt |
236 |
+@@ -3,9 +3,9 @@ tAipsIOCarray |
237 |
+ tAipsIO |
238 |
+ tBucketBuffered |
239 |
+ tBucketCache |
240 |
+-tBucketFile |
241 |
++# tBucketFile # https://github.com/casacore/casacore/issues/73 |
242 |
+ tBucketMapped |
243 |
+-tByteIO |
244 |
++# tByteIO # https://github.com/casacore/casacore/issues/73 |
245 |
+ tByteSink |
246 |
+ tByteSinkSource |
247 |
+ tFilebufIO |
248 |
+diff --git a/casa/OS/test/CMakeLists.txt b/casa/OS/test/CMakeLists.txt |
249 |
+index 520ceed..e5c9ee3 100644 |
250 |
+--- a/casa/OS/test/CMakeLists.txt |
251 |
++++ b/casa/OS/test/CMakeLists.txt |
252 |
+@@ -3,10 +3,10 @@ tCanonicalConversion |
253 |
+ tConversion |
254 |
+ tConversionPerf |
255 |
+ tDataConversion |
256 |
+-tDirectory |
257 |
++# tDirectory # https://github.com/casacore/casacore/issues/73 |
258 |
+ tDirectoryIterator |
259 |
+ tEnvVar |
260 |
+-tFile |
261 |
++# tFile # https://github.com/casacore/casacore/issues/73 |
262 |
+ tHostInfo |
263 |
+ tIBMConversion |
264 |
+ tLECanonicalConversion |
265 |
+@@ -14,10 +14,9 @@ tMemory |
266 |
+ tMemoryTrace |
267 |
+ tModcompConversion |
268 |
+ tMutex |
269 |
+-tPath |
270 |
+ tPrecTimer |
271 |
+-tRegularFile |
272 |
+-tSymLink |
273 |
++# tRegularFile # https://github.com/casacore/casacore/issues/73 |
274 |
++# tSymLink # https://github.com/casacore/casacore/issues/73 |
275 |
+ tTime |
276 |
+ tTimer |
277 |
+ tVAXConversion |
278 |
+diff --git a/images/Images/test/CMakeLists.txt b/images/Images/test/CMakeLists.txt |
279 |
+index 4115c29..6865919 100644 |
280 |
+--- a/images/Images/test/CMakeLists.txt |
281 |
++++ b/images/Images/test/CMakeLists.txt |
282 |
+@@ -69,7 +69,7 @@ tMIRIADImage |
283 |
+ # tPagedImage2 # requires geodetic/Observatories |
284 |
+ # tRebinImage # requires geodetic/Observatories |
285 |
+ tSubImage |
286 |
+-tTempImage |
287 |
++# tTempImage # https://github.com/casacore/casacore/issues/543 |
288 |
+ ) |
289 |
+ |
290 |
+ foreach (test ${tests}) |
291 |
+diff --git a/lattices/LatticeMath/test/CMakeLists.txt b/lattices/LatticeMath/test/CMakeLists.txt |
292 |
+index 47e5c76..23f254f 100644 |
293 |
+--- a/lattices/LatticeMath/test/CMakeLists.txt |
294 |
++++ b/lattices/LatticeMath/test/CMakeLists.txt |
295 |
+@@ -11,7 +11,7 @@ tLatticeHistograms |
296 |
+ tLatticeMathUtil |
297 |
+ tLatticeSlice1D |
298 |
+ tLatticeStatistics |
299 |
+-tLatticeStatsDataProvider |
300 |
++# tLatticeStatsDataProvider # tries to allocate a 1024*1024*1024 array, which is at least 4GiB |
301 |
+ tLatticeTwoPtCorr |
302 |
+ # tLattStatsSpecialize |
303 |
+ ) |
304 |
+diff --git a/scimath/Fitting/test/CMakeLists.txt b/scimath/Fitting/test/CMakeLists.txt |
305 |
+index 35d258f..de69738 100644 |
306 |
+--- a/scimath/Fitting/test/CMakeLists.txt |
307 |
++++ b/scimath/Fitting/test/CMakeLists.txt |
308 |
+@@ -3,8 +3,8 @@ dConstraints |
309 |
+ dLSQFit |
310 |
+ tFitGaussian |
311 |
+ tLinearFitSVD |
312 |
+-tLSQaips |
313 |
+-tLSQFit |
314 |
++#tLSQaips |
315 |
++#tLSQFit |
316 |
+ tNonLinearFitLM |
317 |
+ ) |
318 |
+ |
319 |
+diff --git a/tables/TaQL/test/CMakeLists.txt b/tables/TaQL/test/CMakeLists.txt |
320 |
+index 9cf5223..1fcd338 100644 |
321 |
+--- a/tables/TaQL/test/CMakeLists.txt |
322 |
++++ b/tables/TaQL/test/CMakeLists.txt |
323 |
+@@ -35,8 +35,8 @@ tTaQLNode |
324 |
+ # Only test scripts, no test programs. |
325 |
+ set (testscripts |
326 |
+ ttaql |
327 |
+-tTableGramCretab |
328 |
+-tTableGramAlttab |
329 |
++# tTableGramCretab # https://github.com/casacore/casacore/issues/541 |
330 |
++# tTableGramAlttab # https://github.com/casacore/casacore/issues/541 |
331 |
+ tTableGramUpdate |
332 |
+ tTableGramMasked |
333 |
+ tTableGramNull |
334 |
|
335 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch |
336 |
new file mode 100644 |
337 |
index 00000000000..b7e39f2528a |
338 |
--- /dev/null |
339 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch |
340 |
@@ -0,0 +1,253 @@ |
341 |
+From: Benda Xu <heroxbd@g.o> |
342 |
+Date: Wed, 10 Sep 2014 10:00:43 +0900 |
343 |
+Subject: Disable tests that require data tables |
344 |
+ |
345 |
+The data tables are not available during the build of casacore (yet). |
346 |
+--- |
347 |
+ coordinates/Coordinates/test/CMakeLists.txt | 12 ++++----- |
348 |
+ images/Images/test/CMakeLists.txt | 40 ++++++++++++++--------------- |
349 |
+ images/Regions/test/CMakeLists.txt | 8 +++--- |
350 |
+ lattices/LatticeMath/test/CMakeLists.txt | 2 +- |
351 |
+ meas/MeasUDF/test/CMakeLists.txt | 2 +- |
352 |
+ measures/Measures/test/CMakeLists.txt | 37 ++++++++++++-------------- |
353 |
+ measures/TableMeasures/test/CMakeLists.txt | 2 +- |
354 |
+ ms/MSOper/test/CMakeLists.txt | 6 ++--- |
355 |
+ ms/MeasurementSets/test/CMakeLists.txt | 2 +- |
356 |
+ 9 files changed, 53 insertions(+), 58 deletions(-) |
357 |
+ |
358 |
+diff --git a/coordinates/Coordinates/test/CMakeLists.txt b/coordinates/Coordinates/test/CMakeLists.txt |
359 |
+index bd1c996..248b395 100644 |
360 |
+--- a/coordinates/Coordinates/test/CMakeLists.txt |
361 |
++++ b/coordinates/Coordinates/test/CMakeLists.txt |
362 |
+@@ -1,18 +1,18 @@ |
363 |
+ set (tests |
364 |
+-dCoordinates |
365 |
++#dCoordinates # requires geodetic/Observatories |
366 |
+ dRemoveAxes |
367 |
+ dWorldMap |
368 |
+ tCoordinate |
369 |
+-tCoordinateSystem |
370 |
+-tCoordinateUtil |
371 |
++# tCoordinateSystem # requires geodetic/Observatories |
372 |
++# tCoordinateUtil # requires geodetic/Observatories |
373 |
+ tDirectionCoordinate |
374 |
+-tFrequencyAligner |
375 |
++# tFrequencyAligner # requires geodetic/Observatories |
376 |
+ tGaussianConvert |
377 |
+ tLinearCoordinate |
378 |
+ tLinearXform |
379 |
+-tObsInfo |
380 |
++# tObsInfo # requires geodetic/Observatories |
381 |
+ tProjection |
382 |
+-tSpectralCoordinate |
383 |
++# tSpectralCoordinate # requires geodetic/Observatories |
384 |
+ tStokesCoordinate |
385 |
+ tQualityCoordinate |
386 |
+ tTabularCoordinate |
387 |
+diff --git a/images/Images/test/CMakeLists.txt b/images/Images/test/CMakeLists.txt |
388 |
+index 302d798..4115c29 100644 |
389 |
+--- a/images/Images/test/CMakeLists.txt |
390 |
++++ b/images/Images/test/CMakeLists.txt |
391 |
+@@ -35,39 +35,39 @@ endforeach (file) |
392 |
+ |
393 |
+ set (tests |
394 |
+ dImageInterface |
395 |
+-dImageStatistics |
396 |
+-dImageSummary |
397 |
++# dImageStatistics # requires geodetic/Observatories |
398 |
++# dImageSummary # requires geodetic/Observatories |
399 |
+ dPagedImage |
400 |
+ tExtendImage |
401 |
+-tFITSErrorImage |
402 |
++# tFITSErrorImage # |
403 |
+ tFITSExtImage |
404 |
+ tFITSExtImageII |
405 |
+ tFITSImage |
406 |
+ tFITSImgParser |
407 |
+-tFITSQualityImage |
408 |
++# tFITSQualityImage # |
409 |
+ tHDF5Image |
410 |
+-tImageAttrHandler |
411 |
+-tImageBeamSet |
412 |
+-tImageConcat |
413 |
+-tImageEmpty |
414 |
+-tImageExpr |
415 |
+-tImageExpr2 |
416 |
+-tImageExpr2Gram |
417 |
+-tImageExpr3Gram |
418 |
++# tImageAttrHandler # requires geodetic/Observatories |
419 |
++# tImageBeamSet # |
420 |
++# tImageConcat # needs casacore-data |
421 |
++# tImageEmpty # requires geodetic/Observatories |
422 |
++# tImageExpr |
423 |
++# tImageExpr2 |
424 |
++# tImageExpr2Gram # requires geodetic/Observatories |
425 |
++# tImageExpr3Gram # requires geodetic/Observatories |
426 |
+ tImageExprGram |
427 |
+ tImageExprParse |
428 |
+ tImageExprParse_addDir |
429 |
+ tImageInfo |
430 |
+-tImageProxy |
431 |
+-tImageRegrid |
432 |
++# tImageProxy |
433 |
++# tImageRegrid # requires geodetic/Observatories |
434 |
+ tImageStatistics |
435 |
+-tImageStatistics2 |
436 |
+-tImageUtilities |
437 |
+-tLELSpectralIndex |
438 |
++# tImageStatistics2 # requires geodetic/Observatories |
439 |
++# tImageUtilities # requires geodetic/Observatories |
440 |
++# tLELSpectralIndex # requires geodetic/Observatories |
441 |
+ tMIRIADImage |
442 |
+-tPagedImage |
443 |
+-tPagedImage2 |
444 |
+-tRebinImage |
445 |
++# tPagedImage # requires geodetic/Observatories |
446 |
++# tPagedImage2 # requires geodetic/Observatories |
447 |
++# tRebinImage # requires geodetic/Observatories |
448 |
+ tSubImage |
449 |
+ tTempImage |
450 |
+ ) |
451 |
+diff --git a/images/Regions/test/CMakeLists.txt b/images/Regions/test/CMakeLists.txt |
452 |
+index b94c391..1201346 100644 |
453 |
+--- a/images/Regions/test/CMakeLists.txt |
454 |
++++ b/images/Regions/test/CMakeLists.txt |
455 |
+@@ -9,12 +9,12 @@ foreach (file ${datafiles}) |
456 |
+ endforeach (file) |
457 |
+ |
458 |
+ set (tests |
459 |
+-tImageRegion |
460 |
++# tImageRegion |
461 |
+ tRegionHandler |
462 |
+-tWCBox |
463 |
+-tWCEllipsoid |
464 |
++# tWCBox # requires geodetic/Observatories |
465 |
++# tWCEllipsoid |
466 |
+ tWCExtension |
467 |
+-tWCLELMask |
468 |
++# tWCLELMask # requires geodetic/Observatories |
469 |
+ tWCUnion |
470 |
+ ) |
471 |
+ |
472 |
+diff --git a/lattices/LatticeMath/test/CMakeLists.txt b/lattices/LatticeMath/test/CMakeLists.txt |
473 |
+index 0d869d5..47e5c76 100644 |
474 |
+--- a/lattices/LatticeMath/test/CMakeLists.txt |
475 |
++++ b/lattices/LatticeMath/test/CMakeLists.txt |
476 |
+@@ -13,7 +13,7 @@ tLatticeSlice1D |
477 |
+ tLatticeStatistics |
478 |
+ tLatticeStatsDataProvider |
479 |
+ tLatticeTwoPtCorr |
480 |
+-tLattStatsSpecialize |
481 |
++# tLattStatsSpecialize |
482 |
+ ) |
483 |
+ |
484 |
+ foreach (test ${tests}) |
485 |
+diff --git a/meas/MeasUDF/test/CMakeLists.txt b/meas/MeasUDF/test/CMakeLists.txt |
486 |
+index a2ecd9a..b06ee99 100644 |
487 |
+--- a/meas/MeasUDF/test/CMakeLists.txt |
488 |
++++ b/meas/MeasUDF/test/CMakeLists.txt |
489 |
+@@ -1,5 +1,5 @@ |
490 |
+ set (tests |
491 |
+- tmeas |
492 |
++# tmeas # requires casacore-data |
493 |
+ ) |
494 |
+ |
495 |
+ foreach (test ${tests}) |
496 |
+diff --git a/measures/Measures/test/CMakeLists.txt b/measures/Measures/test/CMakeLists.txt |
497 |
+index c10a670..261adb1 100644 |
498 |
+--- a/measures/Measures/test/CMakeLists.txt |
499 |
++++ b/measures/Measures/test/CMakeLists.txt |
500 |
+@@ -1,25 +1,25 @@ |
501 |
+ set (tests |
502 |
+ dM1950_2000 |
503 |
+-dMeasure |
504 |
+-tEarthField |
505 |
+-tEarthMagneticMachine |
506 |
+-tMBaseline |
507 |
+-tMDirection |
508 |
+-tMEarthMagnetic |
509 |
+-tMFrequency |
510 |
+-tMeasComet |
511 |
+-tMeasIERS |
512 |
+-tMeasJPL |
513 |
++# dMeasure # geodetic/TAI_UTC |
514 |
++# tEarthField # geodetic/IGRF |
515 |
++# tEarthMagneticMachine # geodetic/IGRF |
516 |
++# tMBaseline # geodetic/IGRF |
517 |
++# tMDirection |
518 |
++# tMEarthMagnetic # geodetic/IGRF |
519 |
++# tMFrequency |
520 |
++# tMeasComet # ephemerides/VGEO |
521 |
++# tMeasIERS # geodetic/IERS* |
522 |
++# tMeasJPL # ephemerides/DE200 |
523 |
+ tMeasMath |
524 |
+-tMeasure |
525 |
++# tMeasure # geodetic/TAI_UTC |
526 |
+ tMeasureHolder |
527 |
+-tMuvw |
528 |
+-tParAngleMachine |
529 |
+-tQuality |
530 |
++# tMuvw # geodetic/TAI_UTC |
531 |
++# tParAngleMachine # geodetic/TAI_UTC |
532 |
++# tQuality |
533 |
+ tRecordTransformable |
534 |
+ tStokes |
535 |
+ tUVWMachine |
536 |
+-tVelocityMachine |
537 |
++# tVelocityMachine # geodetic/TAI_UTC |
538 |
+ ) |
539 |
+ |
540 |
+ foreach (test ${tests}) |
541 |
+@@ -29,9 +29,4 @@ foreach (test ${tests}) |
542 |
+ add_dependencies(check ${test}) |
543 |
+ endforeach (test) |
544 |
+ |
545 |
+-if (SOFA_FOUND) |
546 |
+- add_executable (tIAU2000 SofaTest.cc tIAU2000.cc) |
547 |
+- target_link_libraries (tIAU2000 casa_measures ${SOFA_LIBRARY}) |
548 |
+- add_test (tIAU2000 ${CMAKE_SOURCE_DIR}/cmake/cmake_assay ./tIAU2000) |
549 |
+- add_dependencies(check tIAU2000) |
550 |
+-endif (SOFA_FOUND) |
551 |
++# tIAU2000 disabled for missing geodetic/TAI_UTC |
552 |
+diff --git a/measures/TableMeasures/test/CMakeLists.txt b/measures/TableMeasures/test/CMakeLists.txt |
553 |
+index e7c4af1..84e7d6d 100644 |
554 |
+--- a/measures/TableMeasures/test/CMakeLists.txt |
555 |
++++ b/measures/TableMeasures/test/CMakeLists.txt |
556 |
+@@ -1,6 +1,6 @@ |
557 |
+ set (tests |
558 |
+ tTableQuantum |
559 |
+-tTableMeasures |
560 |
++# tTableMeasures # geodetic/{IERSeop{2000,97},IERSpredict{,2000},TAI_UTC} |
561 |
+ dVarRefMdirCol |
562 |
+ ) |
563 |
+ |
564 |
+diff --git a/ms/MSOper/test/CMakeLists.txt b/ms/MSOper/test/CMakeLists.txt |
565 |
+index e53aec3..81912cd 100644 |
566 |
+--- a/ms/MSOper/test/CMakeLists.txt |
567 |
++++ b/ms/MSOper/test/CMakeLists.txt |
568 |
+@@ -1,9 +1,9 @@ |
569 |
+ set (tests |
570 |
+-tMSDerivedValues |
571 |
+-tMSKeys |
572 |
++# tMSDerivedValues # geodetic/IERSpredict |
573 |
++# tMSKeys |
574 |
+ tMSMetaData |
575 |
+ tMSReader |
576 |
+-tMSSummary |
577 |
++# tMSSummary |
578 |
+ ) |
579 |
+ |
580 |
+ foreach (test ${tests}) |
581 |
+diff --git a/ms/MeasurementSets/test/CMakeLists.txt b/ms/MeasurementSets/test/CMakeLists.txt |
582 |
+index 6e66aad..8150ad4 100644 |
583 |
+--- a/ms/MeasurementSets/test/CMakeLists.txt |
584 |
++++ b/ms/MeasurementSets/test/CMakeLists.txt |
585 |
+@@ -15,7 +15,7 @@ tMeasurementSet |
586 |
+ tMSColumns |
587 |
+ tMSDataDescBuffer |
588 |
+ tMSFieldBuffer |
589 |
+-tMSFieldEphem |
590 |
++#tMSFieldEphem requires casacore-data |
591 |
+ tMSIter |
592 |
+ tMSMainBuffer |
593 |
+ tMSPolBuffer |
594 |
|
595 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch b/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch |
596 |
new file mode 100644 |
597 |
index 00000000000..ab9004dc3ec |
598 |
--- /dev/null |
599 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch |
600 |
@@ -0,0 +1,34 @@ |
601 |
+From: Benda Xu <heroxbd@g.o> |
602 |
+Date: Fri, 24 Oct 2014 18:26:54 +0900 |
603 |
+Subject: Do not install test and demonstration executables |
604 |
+ |
605 |
+casacore_{assay,floatcheck} are removed and only used with scons. |
606 |
+measuresdata.csh and ms2uvfits should be included in casacore-doc as examples. |
607 |
+change measuresdata.csh shebang to /usr/bin/tcsh as in Debian. |
608 |
+--- |
609 |
+ measures/apps/CMakeLists.txt | 2 +- |
610 |
+ msfits/apps/CMakeLists.txt | 5 ----- |
611 |
+ 2 files changed, 1 insertion(+), 6 deletions(-) |
612 |
+ delete mode 100644 msfits/apps/CMakeLists.txt |
613 |
+ |
614 |
+diff --git a/measures/apps/CMakeLists.txt b/measures/apps/CMakeLists.txt |
615 |
+index fcf2184..1bbf19f 100644 |
616 |
+--- a/measures/apps/CMakeLists.txt |
617 |
++++ b/measures/apps/CMakeLists.txt |
618 |
+@@ -7,4 +7,4 @@ endforeach(prog findmeastable) |
619 |
+ add_executable (measuresdata measuresdata/measuresdata.cc) |
620 |
+ target_link_libraries (measuresdata casa_measures ${CASACORE_ARCH_LIBS}) |
621 |
+ install(TARGETS measuresdata DESTINATION bin) |
622 |
+-install(PROGRAMS measuresdata/measuresdata-update DESTINATION bin) |
623 |
++install(PROGRAMS DESTINATION bin) |
624 |
+diff --git a/msfits/apps/CMakeLists.txt b/msfits/apps/CMakeLists.txt |
625 |
+deleted file mode 100644 |
626 |
+index d2775c8..0000000 |
627 |
+--- a/msfits/apps/CMakeLists.txt |
628 |
++++ /dev/null |
629 |
+@@ -1,5 +0,0 @@ |
630 |
+-foreach(prog ms2uvfits) |
631 |
+- add_executable (${prog} ${prog}.cc) |
632 |
+- target_link_libraries (${prog} casa_msfits ${CASACORE_ARCH_LIBS}) |
633 |
+- install(TARGETS ${prog} DESTINATION bin) |
634 |
+-endforeach(prog ms2uvfits) |
635 |
|
636 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch b/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch |
637 |
new file mode 100644 |
638 |
index 00000000000..2f07fe3bcf8 |
639 |
--- /dev/null |
640 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch |
641 |
@@ -0,0 +1,162 @@ |
642 |
+From: Edmund Grimley Evans <edmund.grimley.evans@×××××.com> |
643 |
+Date: Thu, 1 Jun 2017 22:34:46 +0100 |
644 |
+Subject: Fix FTBFS tStatisticsUtilities, |
645 |
+ tLatticeStatistics and tLCEllipsoid on arm64 |
646 |
+ |
647 |
+The tests "tStatisticsUtilities" and "tLatticeStatistics" can be made |
648 |
+to pass on arm64 with these adjustments to the expected accuracy. |
649 |
+ |
650 |
+The test "tLCEllipsoid" seems to be converting ellipses into bitmaps. |
651 |
+I'm guessing it gives different output on amd64 and arm64 because the |
652 |
+real curve passes through a critical point and numerical inaccuracy |
653 |
+puts it on different sides of the point on the two architectures. One |
654 |
+way to fix that might be to use non-round numbers in the parameters so |
655 |
+that the curve does not pass through a critical point. That's what I |
656 |
+tried to do, and with the following changes to the program and the |
657 |
+expected output the test passes on both amd64 and arm64. |
658 |
+--- |
659 |
+ lattices/LRegions/test/tLCEllipsoid.cc | 4 ++-- |
660 |
+ lattices/LRegions/test/tLCEllipsoid.out | 24 ++++++++++++------------ |
661 |
+ lattices/LatticeMath/test/tLatticeStatistics.cc | 4 ++-- |
662 |
+ scimath/Mathematics/test/tStatisticsUtilities.cc | 2 +- |
663 |
+ 4 files changed, 17 insertions(+), 17 deletions(-) |
664 |
+ |
665 |
+diff --git a/lattices/LRegions/test/tLCEllipsoid.cc b/lattices/LRegions/test/tLCEllipsoid.cc |
666 |
+index 9e9ee03..2ff65fa 100644 |
667 |
+--- a/lattices/LRegions/test/tLCEllipsoid.cc |
668 |
++++ b/lattices/LRegions/test/tLCEllipsoid.cc |
669 |
+@@ -212,8 +212,8 @@ int main() { |
670 |
+ show(ellipse3); |
671 |
+ |
672 |
+ Float theta = C::pi/4; |
673 |
+- major = 36; |
674 |
+- minor = 16; |
675 |
++ major = 36.01; |
676 |
++ minor = 16.01; |
677 |
+ xcenter = -1; |
678 |
+ ycenter = -1; |
679 |
+ LCEllipsoid ellipse4( |
680 |
+diff --git a/lattices/LRegions/test/tLCEllipsoid.out b/lattices/LRegions/test/tLCEllipsoid.out |
681 |
+index 3709155..17d8e87 100644 |
682 |
+--- a/lattices/LRegions/test/tLCEllipsoid.out |
683 |
++++ b/lattices/LRegions/test/tLCEllipsoid.out |
684 |
+@@ -163,7 +163,7 @@ |
685 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 29] |
686 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 28] |
687 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 27] |
688 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 26] |
689 |
++0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 26] |
690 |
+ 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 [35, 25] |
691 |
+ 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 [35, 24] |
692 |
+ 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 23] |
693 |
+@@ -177,7 +177,7 @@ |
694 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 15] |
695 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 14] |
696 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 13] |
697 |
+-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 12] |
698 |
++1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 12] |
699 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 11] |
700 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 10] |
701 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 9] |
702 |
+@@ -207,10 +207,10 @@ |
703 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 22] |
704 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 21] |
705 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 20] |
706 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19] |
707 |
++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 [35, 19] |
708 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 [35, 18] |
709 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 [35, 17] |
710 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 [35, 16] |
711 |
++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 [35, 16] |
712 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 [35, 15] |
713 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 [35, 14] |
714 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 [35, 13] |
715 |
+@@ -222,11 +222,11 @@ |
716 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 7] |
717 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 6] |
718 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 5] |
719 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 4] |
720 |
++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 4] |
721 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 3] |
722 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 2] |
723 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 1] |
724 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 0] |
725 |
++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 0] |
726 |
+ |
727 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 35] |
728 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 34] |
729 |
+@@ -240,7 +240,7 @@ |
730 |
+ 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 26] |
731 |
+ 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 25] |
732 |
+ 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 24] |
733 |
+-0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 23] |
734 |
++0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 23] |
735 |
+ 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 22] |
736 |
+ 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 21] |
737 |
+ 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 20] |
738 |
+@@ -254,7 +254,7 @@ |
739 |
+ 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 [35, 12] |
740 |
+ 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 [35, 11] |
741 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 10] |
742 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 9] |
743 |
++0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 [35, 9] |
744 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 8] |
745 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 7] |
746 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 6] |
747 |
+@@ -265,11 +265,11 @@ |
748 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 1] |
749 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 0] |
750 |
+ |
751 |
+-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 35] |
752 |
++1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 35] |
753 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 34] |
754 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 33] |
755 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 32] |
756 |
+-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 31] |
757 |
++1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 31] |
758 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 30] |
759 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 29] |
760 |
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 28] |
761 |
+@@ -281,10 +281,10 @@ |
762 |
+ 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 22] |
763 |
+ 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 21] |
764 |
+ 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 20] |
765 |
+-1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19] |
766 |
++1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19] |
767 |
+ 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 18] |
768 |
+ 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 17] |
769 |
+-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 16] |
770 |
++1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 16] |
771 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 15] |
772 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 14] |
773 |
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 13] |
774 |
+diff --git a/lattices/LatticeMath/test/tLatticeStatistics.cc b/lattices/LatticeMath/test/tLatticeStatistics.cc |
775 |
+index 833af91..43e0ae7 100644 |
776 |
+--- a/lattices/LatticeMath/test/tLatticeStatistics.cc |
777 |
++++ b/lattices/LatticeMath/test/tLatticeStatistics.cc |
778 |
+@@ -416,10 +416,10 @@ int main() |
779 |
+ AlwaysAssert(sum(pos) == expSum, AipsError); |
780 |
+ AlwaysAssert(npts(pos) == expNpts, AipsError); |
781 |
+ AlwaysAssert(mean(pos) == expMean, AipsError); |
782 |
+- AlwaysAssert(near(sumsq(pos), expSumSq), AipsError); |
783 |
++ AlwaysAssert(near(sumsq(pos), expSumSq, 1e-9), AipsError); |
784 |
+ AlwaysAssert(near(var(pos), expVar, 1e-10), AipsError); |
785 |
+ AlwaysAssert(near(sigma(pos), expSigma, 1e-11), AipsError); |
786 |
+- AlwaysAssert(near(rms(pos), expRMS), AipsError); |
787 |
++ AlwaysAssert(near(rms(pos), expRMS, 1e-10), AipsError); |
788 |
+ AlwaysAssert(mymin(pos) == DComplex(0, 0), AipsError); |
789 |
+ AlwaysAssert(mymax(pos) == DComplex(size-1, size-1), AipsError); |
790 |
+ |
791 |
+diff --git a/scimath/Mathematics/test/tStatisticsUtilities.cc b/scimath/Mathematics/test/tStatisticsUtilities.cc |
792 |
+index 46491c8..c6c443f 100644 |
793 |
+--- a/scimath/Mathematics/test/tStatisticsUtilities.cc |
794 |
++++ b/scimath/Mathematics/test/tStatisticsUtilities.cc |
795 |
+@@ -265,7 +265,7 @@ int main() { |
796 |
+ AlwaysAssert(got.rms == expec.rms, AipsError); |
797 |
+ AlwaysAssert(near(got.stddev, expec.stddev), AipsError); |
798 |
+ AlwaysAssert(near(got.sum, expec.sum), AipsError); |
799 |
+- AlwaysAssert(got.sumsq == expec.sumsq, AipsError); |
800 |
++ AlwaysAssert(near(got.sumsq, expec.sumsq), AipsError); |
801 |
+ AlwaysAssert(near(got.variance, expec.variance), AipsError); |
802 |
+ AlwaysAssert(*got.max == *expec.max, AipsError); |
803 |
+ AlwaysAssert(*got.min == *expec.min, AipsError); |
804 |
|
805 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch b/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch |
806 |
new file mode 100644 |
807 |
index 00000000000..33723375e4d |
808 |
--- /dev/null |
809 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch |
810 |
@@ -0,0 +1,77 @@ |
811 |
+From: Ole Streicher <olebole@××××××.org> |
812 |
+Date: Fri, 2 Dec 2016 13:16:42 +0100 |
813 |
+Subject: Fix too small int type for memory on 32-bit machines |
814 |
+ |
815 |
+See https://github.com/casacore/casacore/issues/542#issuecomment-264440161 |
816 |
+--- |
817 |
+ casa/OS/HostInfoLinux.h | 22 +++++++++++----------- |
818 |
+ 1 file changed, 11 insertions(+), 11 deletions(-) |
819 |
+ |
820 |
+diff --git a/casa/OS/HostInfoLinux.h b/casa/OS/HostInfoLinux.h |
821 |
+index f792b71..4edf61d 100644 |
822 |
+--- a/casa/OS/HostInfoLinux.h |
823 |
++++ b/casa/OS/HostInfoLinux.h |
824 |
+@@ -132,13 +132,13 @@ skip_token(const char *p) |
825 |
+ // get integer value from v1 cgroup hierarchy of current processes, if |
826 |
+ // sub_value is set it returns the entry of a collection identified by value, |
827 |
+ // e.g. total_rss from memory.stat |
828 |
+-// returns std::numeric_limits<size_t>::max() on error |
829 |
++// returns std::numeric_limits<uInt64>::max() on error |
830 |
+ // note unset cgroup limits usually have intptr_t.max() |
831 |
+ // does not support v2 cgroups |
832 |
+-static inline size_t |
833 |
++static inline uInt64 |
834 |
+ get_cgroup_limit(std::string group, std::string value, std::string sub_value="") |
835 |
+ { |
836 |
+- size_t result = std::numeric_limits<size_t>::max(); |
837 |
++ uInt64 result = std::numeric_limits<uInt64>::max(); |
838 |
+ // assume common location, technically one needs to search for mounts |
839 |
+ const std::string cgroup = std::string("/sys/fs/cgroup/") + group + "/"; |
840 |
+ |
841 |
+@@ -280,12 +280,12 @@ void HostMachineInfo::update_info( ) |
842 |
+ } |
843 |
+ |
844 |
+ /* can't use more memory than allowed by cgroups, enforced */ |
845 |
+- size_t proc_mem_max = get_cgroup_limit("memory", "memory.limit_in_bytes") / 1024; |
846 |
++ uInt64 proc_mem_max = get_cgroup_limit("memory", "memory.limit_in_bytes") / 1024; |
847 |
+ /* usage_in_bytes also includes cache so use memory.stat */ |
848 |
+- size_t proc_mem_used = get_cgroup_limit("memory", "memory.stat", "total_rss") / 1024; |
849 |
++ uInt64 proc_mem_used = get_cgroup_limit("memory", "memory.stat", "total_rss") / 1024; |
850 |
+ |
851 |
+ /* set HostInfo memoryTotal() */ |
852 |
+- memory_total = std::min((size_t)sys_mem_total, proc_mem_max); |
853 |
++ memory_total = std::min((uInt64)sys_mem_total, proc_mem_max); |
854 |
+ |
855 |
+ /* if we have a valid cgroup limit we can determine memoryFree() exactly */ |
856 |
+ if (proc_mem_max <= sys_mem_total && proc_mem_used <= proc_mem_max) { |
857 |
+@@ -293,7 +293,7 @@ void HostMachineInfo::update_info( ) |
858 |
+ } |
859 |
+ else { |
860 |
+ /* no cgroups so we have to assume all memory of host is available */ |
861 |
+- memory_free = std::min((size_t)sys_mem_avail, (size_t)memory_total); |
862 |
++ memory_free = std::min((uInt64)sys_mem_avail, (uInt64)memory_total); |
863 |
+ } |
864 |
+ memory_used = memory_total - memory_free; |
865 |
+ |
866 |
+@@ -303,17 +303,17 @@ void HostMachineInfo::update_info( ) |
867 |
+ cerr << "Error parsing SwapTotal and SwapFree in /proc/meminfo\n"; |
868 |
+ |
869 |
+ /* can't use more swap than allowed by cgroups */ |
870 |
+- size_t proc_swap_max = get_cgroup_limit("memory", "memory.memsw.limit_in_bytes") / 1024; |
871 |
+- size_t proc_swap_used = get_cgroup_limit("memory", "memory.stat", "total_swap") / 1024; |
872 |
++ uInt64 proc_swap_max = get_cgroup_limit("memory", "memory.memsw.limit_in_bytes") / 1024; |
873 |
++ uInt64 proc_swap_used = get_cgroup_limit("memory", "memory.stat", "total_swap") / 1024; |
874 |
+ /* limit is mem + swap */ |
875 |
+ if (proc_mem_max <= sys_mem_total && proc_mem_max <= proc_swap_max) { |
876 |
+ proc_swap_max = proc_swap_max - proc_mem_max; |
877 |
+ } |
878 |
+ |
879 |
+ /* set swapTotal() */ |
880 |
+- swap_total = std::min((size_t)sys_swap_total, proc_swap_max); |
881 |
++ swap_total = std::min((uInt64)sys_swap_total, proc_swap_max); |
882 |
+ |
883 |
+- if (proc_swap_max <= (size_t)swap_total && proc_swap_used <= proc_swap_max) { |
884 |
++ if (proc_swap_max <= (uInt64)swap_total && proc_swap_used <= proc_swap_max) { |
885 |
+ swap_free = proc_swap_max - proc_swap_used; |
886 |
+ } |
887 |
+ else { |
888 |
|
889 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch b/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch |
890 |
new file mode 100644 |
891 |
index 00000000000..bccffcd4b52 |
892 |
--- /dev/null |
893 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch |
894 |
@@ -0,0 +1,36 @@ |
895 |
+From: Ole Streicher <olebole@××××××.org> |
896 |
+Date: Thu, 24 Nov 2016 14:31:06 +0100 |
897 |
+Subject: Loose some tests tFFTServer tests |
898 |
+ |
899 |
+This shall help to compile for mips64el and hppa. |
900 |
+--- |
901 |
+ scimath/Mathematics/test/tFFTServer.cc | 2 +- |
902 |
+ scimath/Mathematics/test/tFFTServer2.cc | 2 +- |
903 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
904 |
+ |
905 |
+diff --git a/scimath/Mathematics/test/tFFTServer.cc b/scimath/Mathematics/test/tFFTServer.cc |
906 |
+index c211f36..711e5a7 100644 |
907 |
+--- a/scimath/Mathematics/test/tFFTServer.cc |
908 |
++++ b/scimath/Mathematics/test/tFFTServer.cc |
909 |
+@@ -1347,7 +1347,7 @@ public: |
910 |
+ } |
911 |
+ AlwaysTrue(result.shape().isEqual(expectedResult.shape()), |
912 |
+ AipsError); |
913 |
+- AlwaysTrue(allNearAbs(result, expectedResult, epsilon), |
914 |
++ AlwaysTrue(allNearAbs(result, expectedResult, 2*epsilon), |
915 |
+ AipsError); |
916 |
+ |
917 |
+ int out_size = expectedResult.nelements(); |
918 |
+diff --git a/scimath/Mathematics/test/tFFTServer2.cc b/scimath/Mathematics/test/tFFTServer2.cc |
919 |
+index a663d50..880bce3 100644 |
920 |
+--- a/scimath/Mathematics/test/tFFTServer2.cc |
921 |
++++ b/scimath/Mathematics/test/tFFTServer2.cc |
922 |
+@@ -1096,7 +1096,7 @@ int main() { |
923 |
+ expectedResult(0) = Complex(5,0); |
924 |
+ server.fft(result, input, True); |
925 |
+ AlwaysAssert(near(result(0), Complex(5,0), FLT_EPSILON), AipsError); |
926 |
+- AlwaysAssert(!near(result(4).imag(), 0.0f, FLT_EPSILON), AipsError); |
927 |
++ AlwaysAssert(!near(result(4).imag(), 0.0f, 2*FLT_EPSILON), AipsError); |
928 |
+ server.fft(reverseTransform, result); |
929 |
+ AlwaysAssert(allNearAbs(input, reverseTransform, FLT_EPSILON), |
930 |
+ AipsError); |
931 |
|
932 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch b/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch |
933 |
new file mode 100644 |
934 |
index 00000000000..2952f39c362 |
935 |
--- /dev/null |
936 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch |
937 |
@@ -0,0 +1,60 @@ |
938 |
+From: Ole Streicher <olebole@××××××.org> |
939 |
+Date: Thu, 24 Nov 2016 14:31:06 +0100 |
940 |
+Subject: Make the check for NFS a bit more portable (BSD) |
941 |
+ |
942 |
+And provide a fallback (f.e. for HURD).However, there is probably no |
943 |
+real use case for that, since also other file systems may be slow or |
944 |
+lack certain features. |
945 |
+--- |
946 |
+ casa/OS/Directory.cc | 21 +++++++++++++++------ |
947 |
+ 1 file changed, 15 insertions(+), 6 deletions(-) |
948 |
+ |
949 |
+diff --git a/casa/OS/Directory.cc b/casa/OS/Directory.cc |
950 |
+index 82e6efc..b79ce0f 100644 |
951 |
+--- a/casa/OS/Directory.cc |
952 |
++++ b/casa/OS/Directory.cc |
953 |
+@@ -488,29 +488,38 @@ Vector<String> Directory::shellExpand (const Vector<String>& files, Bool stripPa |
954 |
+ return expInNames; |
955 |
+ } |
956 |
+ |
957 |
+-#ifndef __APPLE__ |
958 |
++#if defined(__linux__) |
959 |
+ #include <sys/vfs.h> |
960 |
+-#include <linux//nfs_fs.h> |
961 |
+-#else |
962 |
++#include <linux/nfs_fs.h> |
963 |
++#elif defined( __APPLE__) |
964 |
+ #include <sys/param.h> |
965 |
+ #include <sys/mount.h> |
966 |
+ #include <sys/vnode.h> |
967 |
++#elif defined(__FreeBSD_kernel__) |
968 |
++#include <sys/mount.h> |
969 |
++#include <sys/param.h> |
970 |
++#include <stdlib.h> |
971 |
+ #endif |
972 |
+ |
973 |
+ Bool Directory::isNFSMounted() const |
974 |
+ { |
975 |
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) |
976 |
+ struct statfs buf; |
977 |
+ if (statfs (itsFile.path().expandedName().chars(), &buf) < 0) { |
978 |
+ throw (AipsError ("Directory::isNFSMounted error on " + |
979 |
+ itsFile.path().expandedName() + |
980 |
+ ": " + strerror(errno))); |
981 |
+ } |
982 |
+-#ifndef __APPLE__ |
983 |
++#endif |
984 |
++#if defined(__linux__) |
985 |
+ return buf.f_type == NFS_SUPER_MAGIC; |
986 |
+-#else |
987 |
++#elif defined(__APPLE__) |
988 |
+ return buf.f_type == VT_NFS; |
989 |
++#elif defined(__FreeBSD_kernel__) |
990 |
++ return strcmp (buf.f_fstypename, "nfs") == 0; |
991 |
++#else |
992 |
++ return False; |
993 |
+ #endif |
994 |
+- |
995 |
+ } |
996 |
+ |
997 |
+ } //# NAMESPACE CASACORE - END |
998 |
|
999 |
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch b/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch |
1000 |
new file mode 100644 |
1001 |
index 00000000000..86d501365ff |
1002 |
--- /dev/null |
1003 |
+++ b/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch |
1004 |
@@ -0,0 +1,22 @@ |
1005 |
+From: Ole Streicher <olebole@××××××.org> |
1006 |
+Date: Thu, 24 Nov 2016 14:31:06 +0100 |
1007 |
+Subject: Use the correct symbol to detect Linux OS |
1008 |
+ |
1009 |
+Otherwise the compilation fails on powerpc archs |
1010 |
+--- |
1011 |
+ casa/aipsenv.h | 2 +- |
1012 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
1013 |
+ |
1014 |
+diff --git a/casa/aipsenv.h b/casa/aipsenv.h |
1015 |
+index 7e272f0..25912b8 100644 |
1016 |
+--- a/casa/aipsenv.h |
1017 |
++++ b/casa/aipsenv.h |
1018 |
+@@ -130,7 +130,7 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN |
1019 |
+ #if defined(AIPS_LINUX) |
1020 |
+ #undef AIPS_LINUX |
1021 |
+ #endif |
1022 |
+-#if defined(__linux) |
1023 |
++#if defined(__linux__) |
1024 |
+ #define AIPS_LINUX |
1025 |
+ #endif |
1026 |
+ |