Skip to content
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.

Sign up for GitHub

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

Jump to bottom

mpdecimal: Fix cxx+shared, remove unnecessary automake dependency #25903

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
+11 −16
Open

mpdecimal: Fix cxx+shared, remove unnecessary automake dependency #25903

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3772e95
Fix shared + cxx in 2.5.1+
Ahajha Nov 10, 2024
0c8f9ea
Remove automake dependency
Ahajha Nov 10, 2024
6facdac
Simplify package() step
Ahajha Nov 10, 2024
97acc81
Remove legacy patching
Ahajha Nov 10, 2024
b35bf20
Fix Mac shared build
Ahajha Nov 10, 2024
57dbd91
Fix end of file newline
Ahajha Nov 10, 2024
5fafa7c
Conditionally pull from build or source folder
Ahajha Nov 10, 2024
2f28ef6
Fix Windows lib name
Ahajha Nov 10, 2024
b378350
Fix patch
Ahajha Nov 10, 2024
8a4e465
Revert "Fix patch"
Ahajha Nov 11, 2024
3f06a99
Revert "Conditionally pull from build or source folder"
Ahajha Nov 11, 2024
1ef0053
Revert "Fix end of file newline"
Ahajha Nov 11, 2024
d0bc007
Revert "Remove legacy patching"
Ahajha Nov 11, 2024
52229ea
Revert "Simplify package() step"
Ahajha Nov 11, 2024
32bb0c9
Just append LDFLAGS to LDXXFLAGS
Ahajha Nov 11, 2024
2d754aa
Fix Windows packaging
Ahajha Nov 11, 2024
3d101ca
Merge branch 'master' into ahajha/fix-mpdecimal-fix-cxx-shared
Ahajha Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions recipes/mpdecimal/2.5.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ class MpdecimalConan(ConanFile):
"cxx": True,
}

@property
def _settings_build(self):
return getattr(self, "setings_build", self.settings)

def export_sources(self):
export_conandata_patches(self)

Expand All @@ -57,20 +53,16 @@ def validate(self):
if is_msvc(self) and self.settings.arch not in ("x86", "x86_64"):
raise ConanInvalidConfiguration(
f"{self.ref} currently does not supported {self.settings.arch}. Contributions are welcomed")
if self.options.cxx:
if self.options.cxx and Version(self.version) < "2.5.1":
if self.options.shared and self.settings.os == "Windows":
raise ConanInvalidConfiguration(
"A shared libmpdec++ is not possible on Windows (due to non-exportable thread local storage)")

def build_requirements(self):
if is_msvc(self):
self.tool_requires("automake/1.16.5")
else:
# required to support windows as a build machine
if self._settings_build.os == "Windows":
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
self.tool_requires("msys2/cci.latest")
if not is_msvc(self) and self.settings_build.os == "Windows":
self.win_bash = True
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

given that our CI only covers win+msvc, I suppose this is an untested branch now.
Is this to support mingw?

Chances are that we need to detect clang and check if it it needs to fall outside of this conditional as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe I tested this branch with Mingw and it worked. I can play around with it, but regardless of if it works or not this should still be a strict improvement, because the only change is just removing the automake dependency, which definitely was not used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm actually not very familiar with what msys2 is used for in general. Is it just whenever we need access to a unix-style shell in a Windows build? So if we're calling commands like ls, sed, etc. (things that aren't available in Windows)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested mingw and clang. The former works, the latter I don't know how to get working, but I think that's beyond the scope of this PR. I'm certain that it didn't work before either.

if not self.conf.get("tools.microsoft.bash:path", check_type=str):
self.tool_requires("msys2/cci.latest")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down Expand Up @@ -141,13 +133,16 @@ def _build_msvc(self):
copy(self, "mpdecimal.h", libmpdec_folder, dist_folder)
if self.options.shared:
copy(self, f"libmpdec-{self.version}.dll", libmpdec_folder, dist_folder)
copy(self, f"libmpdec-{self.version}.dll.exp", libmpdec_folder, dist_folder)
copy(self, f"libmpdec-{self.version}.dll.lib", libmpdec_folder, dist_folder)
else:
copy(self, f"libmpdec-{self.version}.lib", libmpdec_folder, dist_folder)
if self.options.cxx:
if self.options.shared:
copy(self, f"libmpdec++-{self.version}.dll", libmpdecpp_folder, dist_folder)
copy(self, f"libmpdec++-{self.version}.dll.lib", libmpdecpp_folder, dist_folder)
else:
copy(self, f"libmpdec++-{self.version}.lib", libmpdecpp_folder, dist_folder)
copy(self, "decimal.hh", libmpdecpp_folder, dist_folder)
jcar87 marked this conversation as resolved.
Show resolved Hide resolved
copy(self, f"libmpdec++-{self.version}.lib", libmpdecpp_folder, dist_folder)

@property
def _shared_suffix(self):
Expand Down Expand Up @@ -239,4 +234,4 @@ def package_info(self):
if self.settings.os in ["Linux", "FreeBSD"]:
self.cpp_info.components["libmpdecimal++"].system_libs = ["pthread"]
if self.options.shared and Version(self.version) >= "2.5.1":
self.cpp_info.components["libmpdecimal"].defines = ["MPDECIMALXX_DLL"]
self.cpp_info.components["libmpdecimal++"].defines = ["MPDECIMALXX_DLL"]