fluidsynth: Fix CMake config #242657
Merged
fluidsynth: Fix CMake config #242657
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
marsam
reviewed
Jul 10, 2023
|
Would this supersede #242635? |
Yes. |
Upstream is concatenating CMAKE_INSTALL_LIBDIR onto CMAKE_INSTALL_PREFIX to get a directory to use for the install_name on Darwin. This is not the right way of making CMAKE_INSTALL_LIBDIR absolute. The config was first set up for breakage when the CMAKE_INSTALL_LIBDIR was made relative, in order to work around the wrong concatenation. This caused the _IMPORT_PREFIX to be computed by walking up the directory tree from the config file, instead of using the absolute CMAKE_INSTALL_LIBDIR. Then outputs were introduced to the derivation and the config was moved to a different output. Now the prefix it walks up to is the wrong prefix, and the config is busted. Fix by reverting the original workaround so we have an absolute CMAKE_INSTALL_LIBDIR, and pulling a patch that fixes the bad concatenation.
OPNA2608
force-pushed
the
fix/fluidsynth_cmake_config
branch
from
f427432
to
f43a46f
Compare
|
marsam
approved these changes
Jul 10, 2023
12 tasks
1 task
|
Successfully created backport PR for |
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.
Description of changes
Closes #242623
Upstream is concatenating
CMAKE_INSTALL_LIBDIRontoCMAKE_INSTALL_PREFIXto get a directory to use for the install_name on Darwin. This is not the right way of makingCMAKE_INSTALL_LIBDIRabsolute.The config was first set up for breakage when the
CMAKE_INSTALL_LIBDIRwas made relative, in order to work around the wrong concatenation. This caused the_IMPORT_PREFIXto be computed by walking up the directory tree from the config file, instead of using the absoluteCMAKE_INSTALL_PREFIX.Then outputs were introduced to the derivation and the config was moved to a different output. Now the prefix it walks up to is the wrong prefix, and the config is busted.
Fix by reverting the original workaround so we have an absolute
CMAKE_INSTALL_LIBDIR, and pulling a patch that fixes the bad concatenation.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)