libsodium: fix several regressions of #13792 #14998
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
|
I detected other pull requests that are modifying libsodium/all recipe: This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
SpaceIm
force-pushed
the
fix/libsodium
branch
from
eb2e817
to
5063b7d
Compare
This comment has been minimized.
This comment has been minimized.
SpaceIm
force-pushed
the
fix/libsodium
branch
from
5063b7d
to
69cba0e
Compare
prince-chrismc
approved these changes
Dec 29, 2022
Conan v1 pipelineAll green in build 8 (
Conan v2 pipeline (informative, not required for merge)All green in build 8 ( |
jwillikers
approved these changes
Dec 31, 2022
SpaceIm
commented
Dec 31, 2022
Comment on lines
+137
to
+171
| # FIXME: There is currently no guarantee from new MSBuild helper that props files | ||
| # generated by MSBuildToolchain and MSBuildDeps have precedence over custom values of project. | ||
| # Therefore conantoolchain.props is injected manually before Microsoft.Cpp.Default.props like it was done | ||
| # with /p:ForceImportBeforeCppTargets in legacy MSBuild helper. | ||
| # see: | ||
| # - https://learn.microsoft.com/en-us/cpp/build/modify-project-properties-without-changing-project-file | ||
| # - https://github.com/conan-io/conan/issues/12155 | ||
| conantoolchain_props = os.path.join(self.generators_folder, "conantoolchain.props") | ||
| replace_in_file( | ||
| self, | ||
| vcxproj_file, | ||
| f"<PlatformToolset>{old_toolset}</PlatformToolset>", | ||
| f"<PlatformToolset>{platform_toolset}</PlatformToolset>", | ||
| self, vcxproj_path, | ||
| "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />", | ||
| f"<Import Project=\"{conantoolchain_props}\" />\n<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />", | ||
| ) | ||
|
|
||
| def _build_msvc(self): | ||
| msvc_ver_subfolder = self._msvc_sln_folder or ("vs2022" if self.version != "1.0.18" else "vs2019") | ||
| msvc_sln_folder = os.path.join(self.build_folder, self.source_folder, "builds", "msvc", msvc_ver_subfolder) | ||
|
|
||
| msvc_sln_path = os.path.join(msvc_sln_folder, "libsodium.sln") | ||
|
|
||
| # 1.0.18 only supported up to vs2019. Add support for newer toolsets. | ||
| if self.version == "1.0.18" and msvc_ver_subfolder == "vs2019": | ||
| vcxproj_path = os.path.join(msvc_sln_folder, "libsodium", "libsodium.vcxproj") | ||
| self._fix_msvc_platform_toolset(vcxproj_path, "v142") | ||
| # Honor runtime library from profile | ||
| runtime_library = MSBuildToolchain(self).runtime_library | ||
| for prop_file, runtime_library_old in [ | ||
| ("DebugDEXE.props", "MultiThreadedDebugDLL"), | ||
| ("DebugDLL.props", "MultiThreadedDebugDLL"), | ||
| ("DebugLEXE.props", "MultiThreadedDebug"), | ||
| ("DebugLIB.props", "MultiThreadedDebug"), | ||
| ("DebugLTCG.props", "MultiThreadedDebug"), | ||
| ("DebugSEXE.props", "MultiThreadedDebug"), | ||
| ("ReleaseDEXE.props", "MultiThreadedDLL"), | ||
| ("ReleaseDLL.props", "MultiThreadedDLL"), | ||
| ("ReleaseLEXE.props", "MultiThreaded"), | ||
| ("ReleaseLIB.props", "MultiThreaded"), | ||
| ("ReleaseLTCG.props", "MultiThreaded"), | ||
| ("ReleaseSEXE.props", "MultiThreaded"), | ||
| ]: | ||
| replace_in_file( | ||
| self, os.path.join(msvc_builds_folder, "properties", prop_file), | ||
| f"<RuntimeLibrary>{runtime_library_old}</RuntimeLibrary>", | ||
| f"<RuntimeLibrary>{runtime_library}</RuntimeLibrary>", | ||
| ) |
There was a problem hiding this comment.
I've opened conan-io/conan#12817, I think it will avoid all this mess (which was unecessary with legacy MSBuild helper).
RubenRBS
pushed a commit
to RubenRBS/conan-center-index
that referenced
this pull request
Jan 16, 2023
* rely on similar CMakeLists in test v1 package & test package * modernize more * simplify msvc build logic * properly inject props files generated by MSBuildToolchain * relocatable shared lib on macOS * restore autoreconf call if mingw * honor runtime from profile
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.
Fix several regressions coming from #13792:
@rpathin install_name of shared libMoreover, I've simplified unecessary complex things in msvc build branch (like
_fix_msvc_platform_toolset, unecessary calls to MSBuildDeps or VCVars generators etc).