mpdecimal: Add version 4.0.0

recipes/mpdecimal/2.5.x/conandata.yml → recipes/mpdecimal/all/conandata.yml

@@ -1,11 +1,17 @@
 sources:
+  "4.0.0":
+    sha256: "942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c"
+    url: "http://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.0.tar.gz"
   "2.5.1":
     sha256: "9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f"
     url: "http://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz"
   "2.5.0":
     sha256: "15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca"
     url: "http://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.0.tar.gz"
 patches:
+  "4.0.0":
+    - patch_file: "patches/4.0.0-0001-msvc-fixes.patch"
+    - patch_file: "patches/4.0.0-0003-use-MPDECIMAL_DLL.patch"
   "2.5.1":
     - patch_file: "patches/2.5.1-0001-msvc-fixes.patch"
     - patch_file: "patches/2.5.1-0002-add-mingw-to-configure-ac.patch"

recipes/mpdecimal/2.5.x/conanfile.py → recipes/mpdecimal/all/conanfile.py

@@ -196,7 +196,7 @@ def package(self):
             mpdecppdir = self.build_path / "libmpdec++"
             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")
             builddirs = [mpdecdir]
             if self.options.cxx:
                 builddirs.append(mpdecppdir)

recipes/mpdecimal/all/patches/4.0.0-0001-msvc-fixes.patch

@@ -0,0 +1,97 @@
+diff --git a/libmpdec++/Makefile.vc b/libmpdec++/Makefile.vc
+index 5985c33..bc2bdac 100644
+--- a/libmpdec++/Makefile.vc
++++ b/libmpdec++/Makefile.vc
+@@ -14,11 +14,11 @@ LIBIMPORT_CXX = libmpdec++-4.0.0.dll.lib
+ LIBSHARED_CXX = libmpdec++-4.0.0.dll
+
+ !if "$(DEBUG)" == "1"
+-OPT = /MTd /Od /Zi /EHsc
+-OPT_SHARED = /MDd /Od /Zi /EHsc
++OPT = /Od /Zi /EHsc
++OPT_SHARED = /Od /Zi /EHsc
+ !else
+-OPT = /MT /O2 /GS /EHsc /DNDEBUG
+-OPT_SHARED = /MD /O2 /GS /EHsc /DNDEBUG
++OPT = /O2 /GS /EHsc /DNDEBUG
++OPT_SHARED = /O2 /GS /EHsc /DNDEBUG
+ !endif
+
+ !if "$(CC)" == "clang-cl"
+@@ -27,9 +27,9 @@ WARN = /W4 -Wno-undefined-inline
+ WARN = /W4
+ !endif
+
+-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)
+
+ MPD_LDXXFLAGS= /DLL /MANIFEST $(LDXXFLAGS)
+
+@@ -42,22 +42,22 @@ OBJS = decimal.obj
+ SHARED_OBJS = .objs\decimal.obj
+
+
+-$(LIBSTATIC_CXX): Makefile $(OBJS)
++$(LIBSTATIC_CXX): Makefile.vc $(OBJS)
+ 	-@if exist $@ del $(LIBSTATIC_CXX)
+ 	lib /out:$(LIBSTATIC_CXX) $(OBJS)
+
+-$(LIBSHARED_CXX): Makefile $(SHARED_OBJS)
++$(LIBSHARED_CXX): Makefile.vc $(SHARED_OBJS)
+ 	-@if exist $@ del $(LIBSHARED_CXX)
+ 	link $(MPD_LDXXFLAGS) /out:$(LIBSHARED_CXX) /implib:$(LIBIMPORT_CXX) /LIBPATH:$(SRCDIR) $(SHARED_OBJS) $(LIBIMPORT)
+ 	mt -manifest $(LIBSHARED_CXX).manifest -outputresource:$(LIBSHARED_CXX);2
+
+
+ decimal.obj:\
+-Makefile decimal.cc ..\libmpdec\mpdecimal.h decimal.hh
++Makefile.vc decimal.cc ..\libmpdec\mpdecimal.h decimal.hh
+ 	$(CXX) "-I." "-I$(SRCDIR)" $(MPD_CXXFLAGS) -c decimal.cc
+
+ .objs\decimal.obj:\
+-Makefile decimal.cc ..\libmpdec\mpdecimal.h decimal.hh
++Makefile.vc decimal.cc ..\libmpdec\mpdecimal.h decimal.hh
+ 	$(CXX) "-I." "-I$(SRCDIR)" $(MPD_CXXFLAGS_SHARED) -c decimal.cc /Fo.objs\decimal.obj
+
+
+diff --git a/libmpdec/Makefile.vc b/libmpdec/Makefile.vc
+index 7f72a4b..2ee3ddb 100644
+--- a/libmpdec/Makefile.vc
++++ b/libmpdec/Makefile.vc
+@@ -31,11 +31,11 @@ CONFIG = /DCONFIG_32 /DANSI
+ !endif
+
+ !if "$(DEBUG)" == "1"
+-OPT = /MTd /Od /Zi /EHsc
+-OPT_SHARED = /MDd /Od /Zi /EHsc
++OPT = /Od /Zi /EHsc
++OPT_SHARED = /Od /Zi /EHsc
+ !else
+-OPT = /MT /O2 /GS /EHsc /DNDEBUG
+-OPT_SHARED = /MD /O2 /GS /EHsc /DNDEBUG
++OPT = /O2 /GS /EHsc /DNDEBUG
++OPT_SHARED = /O2 /GS /EHsc /DNDEBUG
+ !endif
+
+ !if "$(CC)" == "clang-cl"
+@@ -44,13 +44,13 @@ WARN = /W4 /wd4200 /wd4204 /wd4221 -Wno-unknown-pragmas -Wno-undefined-inline /D
+ WARN = /W4 /wd4200 /wd4204 /wd4221 /D_CRT_SECURE_NO_WARNINGS
+ !endif
+
+-MPD_CFLAGS = $(WARN) /nologo $(CONFIG) $(OPT)
+-MPD_CFLAGS_SHARED = /DBUILD_LIBMPDEC $(WARN) /nologo $(CONFIG) $(OPT_SHARED) $(PGOFLAGS)
++MPD_CFLAGS = $(WARN) /nologo $(CONFIG) $(OPT) $(CONAN_CFLAGS)
++MPD_CFLAGS_SHARED = /DBUILD_LIBMPDEC $(WARN) /nologo $(CONFIG) $(OPT_SHARED) $(PGOFLAGS) $(CONAN_CFLAGS)
+
+ MPD_BIN_CFLAGS = $(WARN) /nologo $(OPT)
+ MPD_BIN_CFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS)
+
+-MPD_LDFLAGS= /DLL /MANIFEST $(LDFLAGS)
++MPD_LDFLAGS= /DLL /MANIFEST $(LDFLAGS) $(CONAN_LDFLAGS)
+
+
+ default: $(LIBSTATIC) $(LIBSHARED)

recipes/mpdecimal/all/patches/4.0.0-0003-use-MPDECIMAL_DLL.patch

@@ -0,0 +1,39 @@
+diff --git a/libmpdec++/decimal.hh b/libmpdec++/decimal.hh
+index 9040290..5e057cb 100644
+--- a/libmpdec++/decimal.hh
++++ b/libmpdec++/decimal.hh
+@@ -58,7 +58,7 @@
+ #ifdef _MSC_VER
+   #if defined (BUILD_LIBMPDECXX)
+     #define IMPORTEXPORT __declspec(dllexport)
+-  #elif defined(_DLL)
++  #elif defined(MPDECIMAL_DLL)
+     #define IMPORTEXPORT __declspec(dllimport)
+   #else
+     #define IMPORTEXPORT
+diff --git a/libmpdec/mpdecimal32vc.h b/libmpdec/mpdecimal32vc.h
+index 6a35951..43e5631 100644
+--- a/libmpdec/mpdecimal32vc.h
++++ b/libmpdec/mpdecimal32vc.h
+@@ -59,7 +59,7 @@ extern "C" {
+ #if defined (BUILD_LIBMPDEC)
+   #undef IMPORTEXPORT
+   #define IMPORTEXPORT __declspec(dllexport)
+-#elif defined(_DLL)
++#elif defined(MPDECIMAL_DLL)
+   #undef IMPORTEXPORT
+   #define IMPORTEXPORT __declspec(dllimport)
+ #endif
+diff --git a/libmpdec/mpdecimal64vc.h b/libmpdec/mpdecimal64vc.h
+index 9320176..a9944fc 100644
+--- a/libmpdec/mpdecimal64vc.h
++++ b/libmpdec/mpdecimal64vc.h
+@@ -59,7 +59,7 @@ extern "C" {
+ #if defined (BUILD_LIBMPDEC)
+   #undef IMPORTEXPORT
+   #define IMPORTEXPORT __declspec(dllexport)
+-#elif defined(_DLL)
++#elif defined(MPDECIMAL_DLL)
+   #undef IMPORTEXPORT
+   #define IMPORTEXPORT __declspec(dllimport)
+ #endif

recipes/mpdecimal/config.yml

@@ -1,7 +1,9 @@
 versions:
+  "4.0.0":
+    folder: "all"
   "2.5.1":
-    folder: "2.5.x"
+    folder: "all"
   "2.5.0":
-    folder: "2.5.x"
+    folder: "all"
   "2.4.2":
     folder: "2.4.2"