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

mpdecimal: Fix lib name on MSVC/shared, fix Mac cross-builds #25889

Merged
merged 13 commits into from
Nov 11, 2024
Merged

mpdecimal: Fix lib name on MSVC/shared, fix Mac cross-builds #25889

Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3e938a5
Fix mpdecimal lib name on MSVC/shared
Ahajha Nov 9, 2024
7c1f1cd
Convert *_path to *_folder
Ahajha Nov 9, 2024
0adc6b9
Conditionally enable CXX in CMake
Ahajha Nov 9, 2024
b458589
Remove V1 test package
Ahajha Nov 9, 2024
db09532
Fix missing bindirs lint
Ahajha Nov 9, 2024
956d8eb
Fix mac cross-builds
Ahajha Nov 9, 2024
996f562
Revert "Fix missing bindirs lint"
Ahajha Nov 11, 2024
671c4a0
Revert "Remove V1 test package"
Ahajha Nov 11, 2024
10dcf2e
Revert "Conditionally enable CXX in CMake"
Ahajha Nov 11, 2024
8484c61
Revert "Convert *_path to *_folder"
Ahajha Nov 11, 2024
f792258
Just append LDFLAGS to LDXXFLAGS
Ahajha Nov 11, 2024
90b5587
Temporarily disable cxx
Ahajha Nov 11, 2024
f2af09a
Revert "Temporarily disable cxx"
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
17 changes: 8 additions & 9 deletions recipes/mpdecimal/2.5.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from conan import ConanFile
from conan.tools.gnu import AutotoolsToolchain, AutotoolsDeps, Autotools
from conan.tools.gnu import AutotoolsToolchain, Autotools
from conan.tools.files import get, chdir, copy, export_conandata_patches, apply_conandata_patches, mkdir, rename
from conan.tools.layout import basic_layout
from conan.tools.build import cross_building
Expand Down Expand Up @@ -102,13 +102,9 @@ def generate(self):

tc = AutotoolsToolchain(self)
tc.configure_args.append("--enable-cxx" if self.options.cxx else "--disable-cxx")
tc.generate()

deps = AutotoolsDeps(self)
if is_apple_os(self) and self.settings.arch == "armv8":
deps.environment.append("LDFLAGS", ["-arch arm64"])
deps.environment.append("LDXXFLAGS", ["-arch arm64"])
deps.generate()
tc_env = tc.environment()
tc_env.append("LDXXFLAGS", ["$LDFLAGS"])
tc.generate(tc_env)

@property
def _dist_folder(self):
Expand Down Expand Up @@ -219,7 +215,10 @@ def package(self):
def package_info(self):
lib_pre_suf = ("", "")
if is_msvc(self):
lib_pre_suf = ("lib", f"-{self.version}")
if self.options.shared:
lib_pre_suf = ("lib", f"-{self.version}.dll")
jcar87 marked this conversation as resolved.
Show resolved Hide resolved
else:
lib_pre_suf = ("lib", f"-{self.version}")
elif self.settings.os == "Windows":
if self.options.shared:
lib_pre_suf = ("", ".dll")
Expand Down