Commit e1051b8
committed
ship versioned tbb libraries on linux again
The oneTBB cmake build only versions its output on Windows, so on Linux
RcppParallel 6.0.x installed unversioned libraries (e.g. 'libtbb.so' with
SONAME 'libtbb.so'). RcppParallel 5.1.11 and earlier shipped a real
'libtbb.so.2' plus a 'libtbb.so' redirect, inherited from Intel TBB's
make-based build (which set the SONAME from TBB_COMPATIBLE_INTERFACE_VERSION).
Binaries compiled against those releases recorded a load-time dependency on
'libtbb.so.2', and so fail to load after an upgrade with "libtbb.so.2: cannot
open shared object file". Restore the versioned layout for the bundled TBB on
Linux by renaming 'libtbb*.so' to 'libtbb*.so.2' and re-creating 'libtbb*.so'
as a symlink. A symlink (rather than a linker script) is used so the name
resolves at runtime as well as at link time.1 parent d637cbe commit e1051b8
2 files changed
Lines changed: 53 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
3 | 11 | | |
4 | 12 | | |
5 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
53 | 58 | | |
54 | 59 | | |
55 | 60 | | |
| |||
145 | 150 | | |
146 | 151 | | |
147 | 152 | | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
148 | 193 | | |
149 | 194 | | |
150 | 195 | | |
| |||
0 commit comments