glog: 0.4.0 -> 0.5.0, also enable tests #144561
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
|
@tobim Would you be up to be co-maintainer on the |
|
Example The sought file was built but apparently not installed: Indeed it's missing in here: That looks wrong:
This looks like a related workaround in another package: But for our # Directory containing the find modules relative to the config install
# directory.
file (RELATIVE_PATH glog_REL_CMake_MODULES
${_PREFIX}/${_glog_CMake_INSTALLDIR}
${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake) |
|
I cannot pursue this further now. Somebody else needs to put some prints into the |
|
I think this is enough to fix it: --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -868,7 +868,7 @@ configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
file (INSTALL
\"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
DESTINATION
- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\")
+ \"${_glog_CMake_INSTALLDIR}\")
"
COMPONENT Development
)If a relative DESTINATION is given, it's assumed to be relative to the install prefix. So this is more correct anyway, and upstreamable as-is. |
r-burns
reviewed
Nov 4, 2021
@r-burns Great, that works: Would you be up for making the upstream PR, since you understand better what's going on? |
|
I would rather not sign their CLA, especially for such a trivial change. |
@r-burns Makes sense. I will do it. |
|
Upstream PR: google/glog#733 |
r-burns
reviewed
Nov 4, 2021
Patch added to this PR. |
10 tasks
This is fixed now with the above changes. Still building, but 33 of 77 packages have built so far and none has failed. |
|
I get the same issue as google/glog#709 on x86_64-darwin, and it happens on master as well. Maybe best to exclude that test for now |
@r-burns OK, I disabled test on Darwin for now. |
|
@r-burns Would you be up for being co- |
|
Absolutely, feel free to add me |
|
Great, then we're done here. |
|
@GrahamcOfBorg build |
|
Upstream PR was merged. |
|
@r-burns FYI for the future, upstream introduced a test failure for me in the nix build on Linux x86_64 (but not an Ubuntu build). Output: This will be relevant when we upgrade to the next |
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.
Motivation for this change
https://github.com/google/glog/releases/tag/v0.5.0
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)