libtiff: switch back to CMake and fix static #366566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alyssais
force-pushed
the
libtiff-cmake
branch
from
0b80090 to
db5632b
Compare
alyssais
changed the title
Since libwebp was switched to CMake, the .la files that told static builds which libraries had to be linked with libwebp are no longer generated, breaking static builds. By switching libtiff to CMake too, we can use the CMake files instead. (This is necessary, but not sufficient, for static builds to work — a further patch is required.) This was tried once before (in 96d5032 ("libtiff: export private headers for freeimage")), and I reverted it (in 5df9305 ("libtiff: fix cross by switching back to autoconf")), because at the time, it broke cross compilation of libtiff. Things seem to have settled since then, and this now cross compiles correctly. Fixes: 909c491 ("libwebp: build with CMake")
alyssais
force-pushed
the
libtiff-cmake
branch
from
db5632b to
f72ee06
Compare
imincik
reviewed
Dec 21, 2024
emilazy
approved these changes
Jan 5, 2025
There was a problem hiding this comment.
When this used CMake previously,
-DCMAKE_SKIP_BUILD_RPATH=OFFwas required for the tests to pass on Darwin. We'll see if that's still necessary, either via OfBorg or if somebody wants to try a test build on Darwin themself.
Apparently not. Built on x86_64-darwin (rebased on top of master).
|
Thanks @emilazy |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since libwebp was switched to CMake, the .la files that told static builds which libraries had to be linked with libwebp are no longer generated, breaking static builds. By switching libtiff to CMake too, we can use the CMake files instead. A further patch to fix libtiff's linker choice then restores static builds.
CMake was tried once before, and I reverted it, because at the time, it broke cross compilation of libtiff. Things seem to have settled since then, and this now cross compiles correctly.
When this used CMake previously,
-DCMAKE_SKIP_BUILD_RPATH=OFFwas required for the tests to pass on Darwin. We'll see if that's still necessary, either via OfBorg or if somebody wants to try a test build on Darwin themself.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.