Commit 5d827ac
committed
Fix bioconda wrapper types and R conda package load failure
- Pass SWIGWORDSIZE64 to the Python and Java SWIG runs on Linux for ALL
SWIG versions, not only >= 4.4. Bioconda pins swig <4.3 and its
conda-forge swig 4.2.1 build resolves int64_t to 'long long' through
Sim.i's stdint.i include, reproducing the original vector<long long>
vs vector<long> compile failure. With the flag the typedef says
'long', which is correct on Linux whether a given SWIG build resolves
the typedef or keeps int64_t literal. R keeps the >= 4.4 gate
(TTTRLIB_SWIG_INT64_FLAG_R): SWIG 4.2's R backend breaks literal
'long long' returns under the define, and the R module never includes
stdint.i in the first place.
- Build tttrlibStatic without LTO. R CMD INSTALL links the static
archive outside our CMake build; with slim LTO bitcode members the
consumer drops vague-linkage symbols and the R package failed to load
with undefined 'typeinfo for TTTRRange'. Same class of fix as the
bundled libtiff archive.1 parent 1e698d6 commit 5d827ac
2 files changed
Lines changed: 22 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
316 | 316 | | |
317 | 317 | | |
318 | 318 | | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
319 | 326 | | |
320 | 327 | | |
321 | 328 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
27 | 30 | | |
28 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
29 | 35 | | |
30 | 36 | | |
31 | 37 | | |
| |||
212 | 218 | | |
213 | 219 | | |
214 | 220 | | |
215 | | - | |
| 221 | + | |
216 | 222 | | |
217 | 223 | | |
218 | 224 | | |
| |||
0 commit comments