mpdecimal: Add version 4.0.0, fix mac cross-builds #25896
Conversation
Ahajha
force-pushed
the
ahajha/mpdecimal-4.0.0
branch
from
741f3b0
to
1e6dfb3
Compare
Ahajha
force-pushed
the
ahajha/mpdecimal-4.0.0
branch
from
1e6dfb3
to
9c9bb38
Compare
Ahajha
changed the title
| copy(self, "mpdecimal.h", src=mpdecdir, dst=pkg_dir / "include") | ||
| if self.options.cxx: | ||
| copy(self, "decimal.hh", src=mpdecppdir, dst=pkg_dir / "include") | ||
| copy(self, "decimal.hh", src=self.source_path / "libmpdec++", dst=pkg_dir / "include") |
There was a problem hiding this comment.
This section is weird. For some reason, in the cache folder, most of the the files are symlinks in 4.0.0, but actual files in 2.5.1. So we need to copy from the source folder instead. But this only affects the libmpdec++ folder. In fact, making this change to the libmpdec folder causes the C header to not get packaged. I don't understand any of why this is the case, but it works like this.
Also to note: I'm just being consistent here with the usage of *_path variables, I know they're deprecated.
| -MPD_CXXFLAGS = $(WARN) /nologo $(OPT) | ||
| -MPD_CXXFLAGS_SHARED = /DBUILD_LIBMPDECXX $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) | ||
| -MPD_BIN_CXXFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) | ||
| +MPD_CXXFLAGS = $(WARN) /nologo $(OPT) $(CONAN_CXXFLAGS) $(CONAN_CFLAGS) | ||
| +MPD_CXXFLAGS_SHARED = /DBUILD_LIBMPDECXX $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) $(CONAN_LDFLAGS) | ||
| +MPD_BIN_CXXFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) $(CONAN_LDFLAGS) |
There was a problem hiding this comment.
Not sure if this section is still necessary, is this 1.x legacy? If so, I can remove from previous versions too. (there are a few other sections like this too)
This reverts commit 441adc7.
recipes/mpdecimal/config.yml
Outdated
| @@ -1,4 +1,6 @@ | |||
| versions: | |||
| "4.0.0": | |||
| folder: "2.5.x" | |||
There was a problem hiding this comment.
Looking good! But it seems a little bit weird to have the 4.x.x versions inside the 2.5.x folder...
Maybe if changes aren't that big, we could consider renaming the 2.5.x folder to all
There was a problem hiding this comment.
That seems reasonable to me!
CPython 3.13 uses this version.
One of the patches related to mingw I believe is no longer necessary:
configure.acnow has explicit checks for mingwAlso,
autoreconfis never called, so these patches are useless anyways. I'll remove them in a future cleanup PR. I've tested locally with Mingw.I also have two other mpdecimal PRs out: #25889 #25903
And one more after all 3 have been merged: #25918