Commit 7351285
authored
Fix building on CY2025 on MacOS (#1031)
### Fix building with MacOS on CY2025
### Summarize your change.
The versions of openexr and png included with CY2025 introduce rpath
setups, which ends up conflicting with RV's own rpath management on
macos. And resulting in build errors like the following when RV tries to
overwrite them.
```
/Users/nelsonr/git/rv/_build_debug/RV_DEPS_OPENEXR/install/lib/libOpenEXRUtil-3_2_d.32.3.3.6.dylib (for architecture arm64) option "-add_rpath @loader_path/../lib" would duplicate path, file already has LC_RPATH for: @loader_path/../lib
```
The simplest olution is just to disable the rpath generation in those
libraries, and let RV handle it as its currently doing for earlier
versions. An corollary fix was required in the RV rpath script that
removes rpaths to not to fail if there is no rpath (since we now
effectively remove it at the build stage). Another script later in the
build process will add the correct rpath back in.
### Describe the reason for the change.
Fix building on MacOS with CY2025
### Describe what you have tested and on which operating system.
MacOS 26.1
### Add a list of changes, and note any that might need special
attention during the review.
### If possible, provide screenshots.
Signed-off-by: Roger Nelson <[email protected]>1 parent fe14d08 commit 7351285
File tree
3 files changed
+15
-1
lines changed- cmake/dependencies
- src/build
3 files changed
+15
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
166 | 170 | | |
167 | 171 | | |
168 | 172 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
42 | 45 | | |
43 | 46 | | |
44 | 47 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
82 | 89 | | |
83 | 90 | | |
84 | 91 | | |
| |||
0 commit comments