-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rocksdb/6.29.5: add patch to ignore thirdparty.inc #23090
Open
thejohnfreeman
wants to merge
1
commit into
conan-io:master
Choose a base branch
from
thejohnfreeman:rocksdb
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
16 changes: 16 additions & 0 deletions
16
recipes/rocksdb/all/patches/6.29.5-0002-exclude-thirdparty.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index ec59d4491..35577c998 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -101 +100,0 @@ if(MSVC) | ||
- option(WITH_GFLAGS "build with GFlags" OFF) | ||
@@ -103,2 +102,2 @@ if(MSVC) | ||
- include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc) | ||
-else() | ||
+endif() | ||
+ | ||
@@ -117 +116 @@ else() | ||
- if(MINGW) | ||
+ if(MINGW OR MSVC) | ||
@@ -183 +181,0 @@ else() | ||
-endif() |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can get away with a
save(self, os.path.join(self.source_folder, "thirdparty.inc", "")
in_patch_sources()
, which is more stable across versions and easier to maintain.Regarding
WITH_GFLAGS
, there's no need to remove it, probably. However, the recipe needs atc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
for the currenttc.variables
to work correctly for CMakeoption()
-s.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That change won't fix the problem. The branch that calls
find_package()
for each optional dependency will still be skipped becauseMSVC
is truthy. My patch effectively removes the other branch and sends all builds through the path that callsfind_package()
.I remove this call to
option(WITH_GFLAGS)
because it is superceded by a later call.