Merge pull request #3717 from lazka/mpdecimal-2.5.1

mpdecimal: Update to 2.5.1
This commit is contained in:
Christoph Reiter 2023-04-10 09:54:05 +02:00 committed by GitHub
commit ac22cf7ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 126 additions and 139 deletions

View File

@ -2,19 +2,19 @@
pkgbase=mpdecimal
pkgname=('mpdecimal' 'mpdecimal-devel')
pkgver=2.5.0
pkgver=2.5.1
pkgrel=1
pkgdesc="Package for correctly-rounded arbitrary precision decimal floating point arithmetic"
arch=('i686' 'x86_64')
url="https://www.bytereef.org/mpdecimal/index.html"
license=('custom')
license=('spdx:BSD-2-Clause')
depends=('gcc-libs')
makedepends=('autotools' 'gcc')
checkdepends=('wget')
source=("http://www.bytereef.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz"
"mpdecimal-2.5.0-msys-mingw.patch")
sha512sums=('6f889f5f8c3e5854204ad7380b63c1bfeb5193c1d464f9a32149d47d1c9bd996c6a57b867ab65ea84f33e87fe69cb45ad78aa2abfb9bb5144eb527587016c472'
'2fa72d50b6ab3d792c6512c682f48adff14387c259817b5749f54918c06a684015b2dec569148c1fc05147b675a25094531713f9f04ef968c43d8987ba064fcc')
sha256sums=('9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f'
'a1ac23df732d1fabefd68cd553ddaa559b11abf87134feb72e1c7d4890a8ca59')
prepare() {
cd ${pkgname}-${pkgver}
@ -49,9 +49,6 @@ package_mpdecimal-devel() {
pkgdesc="mpdecimal headers and libraries"
cd ${srcdir}/dest
# mkdir -p ${pkgdir}/usr/include
# mkdir -p ${pkgdir}/usr/lib
# mkdir -p ${pkgdir}/bin/share
cp -rf usr ${pkgdir}/usr
rm -r ${pkgdir}/usr/bin
}

View File

@ -1,18 +1,17 @@
diff -Naur mpdecimal-2.5.0-orig/configure.ac mpdecimal-2.5.0/configure.ac
--- mpdecimal-2.5.0-orig/configure.ac 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/configure.ac 2020-07-16 10:01:48.795325300 +0300
@@ -12,6 +12,8 @@
AC_MSG_RESULT($ac_sys_system)
diff -Nur mpdecimal-2.5.1-orig/configure.ac mpdecimal-2.5.1/configure.ac
--- mpdecimal-2.5.1-orig/configure.ac 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/configure.ac 2021-08-28 16:41:17.444914500 +0200
@@ -198,6 +198,7 @@
LIBSTATIC=libmpdec.a
LIBSHARED_USE_AR="no"
LIBIMPORT=
+IS_WINDOWS=no
+LIBIMPORT=
case $ac_sys_system in
darwin*|Darwin*)
LIBNAME="libmpdec.dylib"
@@ -19,6 +21,22 @@
LIBSHARED="libmpdec.2.5.0.dylib"
CONFIGURE_LDFLAGS="-dynamiclib -install_name @rpath/$LIBSONAME -compatibility_version 2.5 -current_version 2.5.0"
LINK_STATIC=
LINK_DYNAMIC=
LINK_SHLIBS="-lmpdec"
@@ -219,6 +220,22 @@
LINK_DYNAMIC="-Wl,-bshared"
LINK_SHLIBS="../libmpdec/$LIBIMPORT"
;;
+ mingw*|MINGW*)
+ LIBNAME=
@ -32,23 +31,18 @@ diff -Naur mpdecimal-2.5.0-orig/configure.ac mpdecimal-2.5.0/configure.ac
+ ;;
*)
LIBNAME="libmpdec.so"
LIBSONAME="libmpdec.so.2"
@@ -31,9 +49,12 @@
AC_SUBST(LIBNAME)
AC_SUBST(LIBSONAME)
AC_SUBST(LIBSHARED)
+AC_SUBST(LIBIMPORT)
+AC_SUBST(IS_WINDOWS)
LIBSONAME="libmpdec.so.3"
@@ -228,6 +245,7 @@
esac
LIBSTATIC_CXX=libmpdec++.a
+LIBIMPORT_CXX=
LINK_SHLIBS_CXX="-lmpdec++"
case $ac_sys_system in
darwin*|Darwin*)
LIBNAME_CXX="libmpdec++.dylib"
@@ -41,6 +62,20 @@
LIBSHARED_CXX="libmpdec++.2.5.0.dylib"
CONFIGURE_LDXXFLAGS="-dynamiclib -install_name @rpath/$LIBSONAME_CXX -undefined dynamic_lookup -compatibility_version 2.5 -current_version 2.5.0"
@@ -242,6 +260,20 @@
LIBSHARED_CXX="shr.o"
CONFIGURE_LDXXFLAGS="-shared -Wl,-bnoentry -Wl,-bE:.objs/symbols.exp"
;;
+ mingw*|MINGW*)
+ LIBNAME_CXX=
@ -66,42 +60,50 @@ diff -Naur mpdecimal-2.5.0-orig/configure.ac mpdecimal-2.5.0/configure.ac
+ ;;
*)
LIBNAME_CXX="libmpdec++.so"
LIBSONAME_CXX="libmpdec++.so.2"
@@ -53,6 +88,7 @@
LIBSONAME_CXX="libmpdec++.so.3"
@@ -255,6 +287,7 @@
AC_SUBST(LIBSONAME)
AC_SUBST(LIBSHARED)
AC_SUBST(LIBIMPORT)
+AC_SUBST(IS_WINDOWS)
AC_SUBST(LIBSHARED_USE_AR)
AC_SUBST(LINK_STATIC)
AC_SUBST(LINK_DYNAMIC)
@@ -264,6 +297,7 @@
AC_SUBST(LIBNAME_CXX)
AC_SUBST(LIBSONAME_CXX)
AC_SUBST(LIBSHARED_CXX)
+AC_SUBST(LIBIMPORT_CXX)
AC_SUBST(LINK_SHLIBS_CXX)
# Apparently purely informational for this particular build:
AC_CANONICAL_HOST
diff -Naur mpdecimal-2.5.0-orig/libmpdec/Makefile.in mpdecimal-2.5.0/libmpdec/Makefile.in
--- mpdecimal-2.5.0-orig/libmpdec/Makefile.in 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/libmpdec/Makefile.in 2020-07-16 10:01:17.712406300 +0300
@@ -8,6 +8,8 @@
LIBNAME = @LIBNAME@
diff -Nur mpdecimal-2.5.1-orig/libmpdec/Makefile.in mpdecimal-2.5.1/libmpdec/Makefile.in
--- mpdecimal-2.5.1-orig/libmpdec/Makefile.in 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/libmpdec/Makefile.in 2021-08-28 16:51:47.066899100 +0200
@@ -10,6 +10,7 @@
LIBSONAME = @LIBSONAME@
LIBSHARED = @LIBSHARED@
+LIBIMPORT = @LIBIMPORT@
LIBIMPORT = @LIBIMPORT@
+IS_WINDOWS= @IS_WINDOWS@
CC = @CC@
LD = @LD@
@@ -54,8 +56,10 @@
LIBSHARED_USE_AR = @LIBSHARED_USE_AR@
LINK_STATIC = @LINK_STATIC@
LINK_DYNAMIC = @LINK_DYNAMIC@
@@ -84,9 +85,11 @@
$(LIBSHARED): Makefile $(SHARED_OBJS)
$(LD) $(MPD_LDFLAGS) -o $(LIBSHARED) $(SHARED_OBJS) -lm
+ifeq ($(IS_WINDOWS),no)
ln -sf $(LIBSHARED) $(LIBNAME)
ln -sf $(LIBSHARED) $(LIBSONAME)
endif
+endif
basearith.o:\
diff -Naur mpdecimal-2.5.0-orig/libmpdec++/Makefile.in mpdecimal-2.5.0/libmpdec++/Makefile.in
--- mpdecimal-2.5.0-orig/libmpdec++/Makefile.in 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/libmpdec++/Makefile.in 2020-07-16 10:01:36.106553800 +0300
@@ -8,11 +8,14 @@
diff -Nur mpdecimal-2.5.1-orig/libmpdec++/Makefile.in mpdecimal-2.5.1/libmpdec++/Makefile.in
--- mpdecimal-2.5.1-orig/libmpdec++/Makefile.in 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/libmpdec++/Makefile.in 2021-08-28 16:52:35.175574300 +0200
@@ -9,11 +9,14 @@
LIBNAME = @LIBNAME@
LIBSONAME = @LIBSONAME@
LIBSHARED = @LIBSHARED@
@ -113,30 +115,31 @@ diff -Naur mpdecimal-2.5.0-orig/libmpdec++/Makefile.in mpdecimal-2.5.0/libmpdec+
LIBSONAME_CXX = @LIBSONAME_CXX@
LIBSHARED_CXX = @LIBSHARED_CXX@
+LIBIMPORT_CXX = @LIBIMPORT_CXX@
CXX = @CXX@
LDXX = @LDXX@
@@ -53,8 +56,12 @@
LIBSHARED_USE_AR = @LIBSHARED_USE_AR@
LINK_STATIC = @LINK_STATIC@
LINK_DYNAMIC = @LINK_DYNAMIC@
@@ -74,10 +77,14 @@
$(RANLIB) $(LIBSTATIC_CXX)
$(LIBSHARED_CXX): Makefile $(SHARED_OBJS)
+ifeq ($(IS_WINDOWS),yes)
+ $(LDXX) $(MPD_LDXXFLAGS) -o $(LIBSHARED_CXX) $(SHARED_OBJS) ../libmpdec/$(LIBIMPORT) -lm
+else
$(LDXX) $(MPD_LDXXFLAGS) -o $(LIBSHARED_CXX) $(SHARED_OBJS) -lm
$(MPD_LDXX) -L../libmpdec $(MPD_LDXXFLAGS) -o $(LIBSHARED_CXX) $(SHARED_OBJS) -lmpdec -lm
ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX)
ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX)
endif
+endif
decimal.o:\
diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in
--- mpdecimal-2.5.0-orig/Makefile.in 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/Makefile.in 2020-07-16 10:01:03.688124100 +0300
@@ -14,15 +14,19 @@
LIBNAME = @LIBNAME@
diff -Nur mpdecimal-2.5.1-orig/Makefile.in mpdecimal-2.5.1/Makefile.in
--- mpdecimal-2.5.1-orig/Makefile.in 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/Makefile.in 2021-08-28 16:43:00.149589100 +0200
@@ -16,17 +16,20 @@
LIBSONAME = @LIBSONAME@
LIBSHARED = @LIBSHARED@
+LIBIMPORT = @LIBIMPORT@
LIBIMPORT = @LIBIMPORT@
+IS_WINDOWS= @IS_WINDOWS@
LIBSTATIC_CXX = @LIBSTATIC_CXX@
@ -145,6 +148,8 @@ diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in
LIBSHARED_CXX = @LIBSHARED_CXX@
+LIBIMPORT_CXX = @LIBIMPORT_CXX@
LIBSHARED_USE_AR = @LIBSHARED_USE_AR@
prefix = @prefix@
exec_prefix = @exec_prefix@
includedir = @includedir@
@ -152,10 +157,19 @@ diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in
libdir = @libdir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -65,8 +68,14 @@
$(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir)
$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)
@@ -48,7 +51,7 @@
cd libmpdec++ && $(MAKE) check_alloc
ifeq ($(LIBSHARED_USE_AR), yes)
-install: install_libcxx install_imp install_cxx_doc
+install: install_libcxx install_impcxx install_cxx_doc
else
ifeq ($(ENABLE_SHARED), yes)
install: install_shared_libcxx install_cxx_doc
@@ -96,8 +99,14 @@
$(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir)
install_shared_lib: install_lib
+ifeq ($(IS_WINDOWS),yes)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -m 655 libmpdec/$(LIBIMPORT) $(DESTDIR)$(libdir)
@ -164,13 +178,13 @@ diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in
$(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME)
+endif
$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
cp -R doc/libmpdec $(DESTDIR)$(docdir)
@@ -75,8 +83,14 @@
$(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir)
$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)
install_imp:
$(INSTALL) -m 644 libmpdec/$(LIBIMPORT) $(DESTDIR)$(libdir)
@@ -113,8 +122,14 @@
$(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir)
install_shared_libcxx: install_shared_lib install_libcxx
+ifeq ($(IS_WINDOWS),yes)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -m 644 libmpdec++/$(LIBIMPORT_CXX) $(DESTDIR)$(libdir)
@ -179,66 +193,54 @@ diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in
$(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX)
+endif
cp -R doc/libmpdec++ $(DESTDIR)$(docdir)
install_cxx_doc: install_doc
cp -Rp doc/libmpdec++ $(DESTDIR)$(docdir)
diff -Nur mpdecimal-2.5.1-orig/tests/Makefile.in mpdecimal-2.5.1/tests/Makefile.in
--- mpdecimal-2.5.1-orig/tests/Makefile.in 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/tests/Makefile.in 2021-08-28 16:46:42.826010700 +0200
@@ -15,6 +15,9 @@
diff -Naur mpdecimal-2.5.0-orig/tests/Makefile.in mpdecimal-2.5.0/tests/Makefile.in
--- mpdecimal-2.5.0-orig/tests/Makefile.in 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests/Makefile.in 2020-07-16 09:18:19.812162800 +0300
@@ -6,6 +6,9 @@
CC = @CC@
AR = @AR@
MPD_GNU99 = @MPD_GNU99@
+# Windows demands some special build rules.
+IS_WINDOWS = @IS_WINDOWS@
+
CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@
CFLAGS ?= $(CONFIGURE_CFLAGS)
MPD_CFLAGS = $(strip $(filter-out $(CFLAGS),$(CONFIGURE_CFLAGS)) $(CFLAGS) $(MPD_GNU99))
@@ -41,6 +44,9 @@
@@ -52,6 +55,9 @@
clean: FORCE
rm -f *.o *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock
rm -f runtest runtest_shared runtest_alloc runtest_alloc_shared
rm -f runtest runtest_shared
+ifeq ($(IS_WINDOWS),yes)
+ rm -f *.dll *.exe
+endif
distclean: FORCE
$(MAKE) clean
diff -Naur mpdecimal-2.5.0-orig/tests/runshort.sh mpdecimal-2.5.0/tests/runshort.sh
--- mpdecimal-2.5.0-orig/tests/runshort.sh 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests/runshort.sh 2020-07-16 10:07:26.285336100 +0300
@@ -30,6 +30,13 @@
diff -Nur mpdecimal-2.5.1-orig/tests/runshort.sh mpdecimal-2.5.1/tests/runshort.sh
--- mpdecimal-2.5.1-orig/tests/runshort.sh 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/tests/runshort.sh 2021-08-28 18:50:12.073569400 +0200
@@ -46,6 +46,7 @@
printf "Running additional tests ...\n\n"
LD_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec"
LD_32_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec"
+PATH="$LD_LIBRARY_PATH:$PATH"
export LD_LIBRARY_PATH
export LD_32_LIBRARY_PATH
+case "$(uname -s)" in
+ CYGWIN*|MINGW*|MSYS*)
+ cp -f ../libmpdec/*.dll .
+ cp -f ../libmpdec++/*.dll .
+ ;;
+esac
+
if ! ./runtest additional.decTest
then
printf "\nFAIL\n\n\n"
diff -Naur mpdecimal-2.5.0-orig/tests/runshort_alloc.sh mpdecimal-2.5.0/tests/runshort_alloc.sh
--- mpdecimal-2.5.0-orig/tests/runshort_alloc.sh 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests/runshort_alloc.sh 2020-07-16 10:07:24.025648400 +0300
@@ -22,6 +22,13 @@
diff -Nur mpdecimal-2.5.1-orig/tests/runshort_alloc.sh mpdecimal-2.5.1/tests/runshort_alloc.sh
--- mpdecimal-2.5.1-orig/tests/runshort_alloc.sh 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/tests/runshort_alloc.sh 2021-08-28 16:58:55.526592500 +0200
@@ -44,6 +44,7 @@
printf "Running official tests with allocation failures ...\n\n"
LD_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec"
LD_32_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec"
+PATH="$LD_LIBRARY_PATH:$PATH"
export LD_LIBRARY_PATH
export LD_32_LIBRARY_PATH
+case "$(uname -s)" in
+ CYGWIN*|MINGW*|MSYS*)
+ cp -f ../libmpdec/*.dll .
+ cp -f ../libmpdec++/*.dll .
+ ;;
+esac
+
if ! ./runtest_alloc official.decTest
then
printf "\nFAIL\n\n\n"
diff -Naur mpdecimal-2.5.0-orig/tests/runtest.c mpdecimal-2.5.0/tests/runtest.c
--- mpdecimal-2.5.0-orig/tests/runtest.c 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests/runtest.c 2020-07-16 09:18:19.834286900 +0300
@ -253,37 +255,25 @@ diff -Naur mpdecimal-2.5.0-orig/tests/runtest.c mpdecimal-2.5.0/tests/runtest.c
#define MAXLINE 400000
#define MAXTOKEN 32
diff -Naur mpdecimal-2.5.0-orig/tests++/runshort.sh mpdecimal-2.5.0/tests++/runshort.sh
--- mpdecimal-2.5.0-orig/tests++/runshort.sh 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests++/runshort.sh 2020-07-16 10:07:44.750505500 +0300
@@ -22,6 +22,13 @@
diff -Nur mpdecimal-2.5.1-orig/tests++/runshort.sh mpdecimal-2.5.1/tests++/runshort.sh
--- mpdecimal-2.5.1-orig/tests++/runshort.sh 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/tests++/runshort.sh 2021-08-28 17:02:19.339551800 +0200
@@ -63,6 +63,7 @@
printf "Running official tests ...\n\n"
LD_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec:$PORTABLE_PWD/../libmpdec++"
LD_32_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec:$PORTABLE_PWD/../libmpdec++"
+PATH="$LD_LIBRARY_PATH:$PATH"
export LD_LIBRARY_PATH
export LD_32_LIBRARY_PATH
+case "$(uname -s)" in
+ CYGWIN*|MINGW*|MSYS*)
+ cp -f ../libmpdec/*.dll .
+ cp -f ../libmpdec++/*.dll .
+ ;;
+esac
+
if ! ./runtest official.topTest --threaded; then
printf "\nFAIL\n\n\n"
exit 1
diff -Naur mpdecimal-2.5.0-orig/tests++/runshort_alloc.sh mpdecimal-2.5.0/tests++/runshort_alloc.sh
--- mpdecimal-2.5.0-orig/tests++/runshort_alloc.sh 2020-06-27 22:41:49.000000000 +0300
+++ mpdecimal-2.5.0/tests++/runshort_alloc.sh 2020-07-16 10:07:37.918615300 +0300
@@ -22,6 +22,13 @@
diff -Nur mpdecimal-2.5.1-orig/tests++/runshort_alloc.sh mpdecimal-2.5.1/tests++/runshort_alloc.sh
--- mpdecimal-2.5.1-orig/tests++/runshort_alloc.sh 2021-01-20 15:07:31.000000000 +0100
+++ mpdecimal-2.5.1/tests++/runshort_alloc.sh 2021-08-28 17:02:28.555004800 +0200
@@ -61,6 +61,7 @@
printf "Running official tests with allocation failures ...\n\n"
+case "$(uname -s)" in
+ CYGWIN*|MINGW*|MSYS*)
+ cp -f ../libmpdec/*.dll .
+ cp -f ../libmpdec++/*.dll .
+ ;;
+esac
+
if ! ./runtest_alloc official.topTest --threaded; then
printf "\nFAIL\n\n\n"
exit 1
LD_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec:$PORTABLE_PWD/../libmpdec++"
LD_32_LIBRARY_PATH="$PORTABLE_PWD/../libmpdec:$PORTABLE_PWD/../libmpdec++"
+PATH="$LD_LIBRARY_PATH:$PATH"
export LD_LIBRARY_PATH
export LD_32_LIBRARY_PATH