* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/
@ 2016-04-13 14:34 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-13 14:34 UTC (permalink / raw
To: gentoo-commits
commit: 9f00d603354fbbb958798a6d8652b8fd2cece88d
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 14:32:48 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 14:32:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f00d603
dev-libs/mpfr: add upstream cygwin fix #579840
dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch | 39 +++++++++++++++++++++++++++++
dev-libs/mpfr/mpfr-3.1.4.ebuild | 2 ++
2 files changed, 41 insertions(+)
diff --git a/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch b/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch
new file mode 100644
index 0000000..c051b46
--- /dev/null
+++ b/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/579840
+
+fix from upstream
+
+r10260 | vlefevre | 2016-04-08 19:17:07 -0400 (Fri, 08 Apr 2016) | 8 lines
+
+[src/mpfr-impl.h] Removed the detection of possible inconsistencies
+under Unix because the tests could yield spurious errors with Cygwin
+or other similar implementations. Moreover, such tests were used for
+debugging purpose or to detect potential problems in the environment,
+thus were not really useful for the end user. They were initially
+added in the win-thread-safe-dll branch (r9682, following a problem
+found in r9680). One alternative for checking by the MPFR developers
+would be to output the status of some internal macros in tversion.
+
+Index: src/mpfr-impl.h
+===================================================================
+--- src/mpfr-impl.h (revision 10259)
++++ src/mpfr-impl.h (revision 10260)
+@@ -208,19 +208,6 @@ typedef struct __gmpfr_cache_s *mpfr_cac
+ # define MPFR_WIN_THREAD_SAFE_DLL 1
+ #endif
+
+-/* Detect some possible inconsistencies under Unix. */
+-#if defined(__unix__)
+-# if defined(_WIN32)
+-# error "Both __unix__ and _WIN32 are defined"
+-# endif
+-# if __GMP_LIBGMP_DLL
+-# error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
+-# endif
+-# if defined(MPFR_WIN_THREAD_SAFE_DLL)
+-# error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
+-# endif
+-#endif
+-
+ #if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
+ extern MPFR_THREAD_ATTR mpfr_flags_t __gmpfr_flags;
+ extern MPFR_THREAD_ATTR mpfr_exp_t __gmpfr_emin;
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index 50325e0..32edb16 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -31,6 +31,8 @@ src_prepare() {
epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
done
fi
+ epatch "${FILESDIR}"/${P}-cygwin.patch #579840
+ epatch_user
find . -type f -exec touch -r configure {} +
elibtoolize
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/
@ 2020-03-01 20:40 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-03-01 20:40 UTC (permalink / raw
To: gentoo-commits
commit: f7c5c7d86ea8e9fb39a1510e540440189b9bf871
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 20:28:19 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 20:39:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c5c7d8
dev-libs/mpfr: drop old
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/mpfr/Manifest | 8 ----
dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch | 39 ------------------
dev-libs/mpfr/mpfr-3.1.3_p4.ebuild | 63 -----------------------------
dev-libs/mpfr/mpfr-3.1.4.ebuild | 56 -------------------------
dev-libs/mpfr/mpfr-3.1.5_p2.ebuild | 55 -------------------------
dev-libs/mpfr/mpfr-3.1.6.ebuild | 54 -------------------------
dev-libs/mpfr/mpfr-4.0.0-r1.ebuild | 58 --------------------------
dev-libs/mpfr/mpfr-4.0.1.ebuild | 58 --------------------------
8 files changed, 391 deletions(-)
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index cee8cb9e963..a0ad83deb2d 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,11 +1,3 @@
DIST mpfr-2.4.2-patchset.tar.bz2 2965 BLAKE2B 2748f8ebea766265ea1b31de1c0494e89e8868440675e4f8b03a771b220f3007ffa1bfdeb84112560d95107d4075ed6e37d54aa71546c8bc7e518ff32a1adce6 SHA512 d28749096ff1d8ab026eba076d7874fd0687dd5199dcadb60ab9a5adcfbe4c1a4583c83e5d4868e16e2218247f129623128af89d41e1c348c64c1e91bcb5e653
DIST mpfr-2.4.2.tar.bz2 1077886 BLAKE2B bdbd8fcd5b3f459383fff60adb75e3e419b65b20073a86fbad83677fa546f8f2364bce799f623964cafe94b1b8652a13b54cdae8d9316350c24061c396cafa8b SHA512 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
-DIST mpfr-3.1.3-patchset.tar.xz 12988 BLAKE2B b2ebf0f0d5b90f8f9618c71762ca3def64bad6c79e7b32ca0d9121d2ed4032b869b945359da79ba2eb2cca07789cc1ede1502bb998f5f1234b206825d2db6ebd SHA512 dd2de34aad0470920f75b8911701a2979205b3173b97c41d4b5cd9ff78a38633ca7d6993c2e5465b5e5f76066d46189a32437f5b79ac50c29f2a47970c0421ea
-DIST mpfr-3.1.3.tar.xz 1112096 BLAKE2B cd7bc886e73ff43e323cde837bc90a41cf97238054e1ffe597455314f307ff7d8c95756b1414ee030a1f974c8041669b75dbf90581c9c5705e3f5c8a1878de46 SHA512 79846fd82974269aa48152c2b6dbcb2321130dc4d0f0ba2eb94d56619b177add9b2077ebf88b4382c56db19c4215910e5a252f216715c1eee40baa299da42eb4
-DIST mpfr-3.1.4.tar.xz 1122152 BLAKE2B d8d686c3280c062a0941c37cb0a0bacfb25a03a6064489b56db331ffbd9369c453ded1357b2c5841fc72eee2ef36c4d7a8acc27418dcf5f045c7e4ea6615d682 SHA512 4ef61708834efdea6b85258f46f1b25ce1c55b912f44b117d8c3d5e06d8f1177e50f627d9736f3289bd159c5bb10c80e09d1ad9f6f52c4ff43c3496034b04232
-DIST mpfr-3.1.5-patchset.tar.xz 1840 BLAKE2B c18392ecc3325c0b889b540257f3bfe3c382a7f0d12a5dc87550e9ee884f87480bcfec7541e05c6c27bcfd7c5fa60d35f575f56ccea59912434b241f51e5d113 SHA512 24ae807db036345267623dd977387b154e905197aa826e82cfc8dcf324ade78f78aef9e86ca6e2cbc091e01a8da9ea6c52a91a5183375d5fab45e54912bd3fd8
-DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6bd897038dc306d597ea412013c869b3d2f9c4ba2a1d5e59eee67f562fc3bf5db8fd1584b70c1b30574e42f5 SHA512 3643469b9099b31e41d6ec9158196cd1c30894030c8864ee5b1b1e91b488bccbf7c263c951b03fe9f4ae6f9d29279e157a7dfed0885467d875f107a3d964f032
-DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
-DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
-DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
diff --git a/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch b/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch
deleted file mode 100644
index c051b4621bd..00000000000
--- a/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/579840
-
-fix from upstream
-
-r10260 | vlefevre | 2016-04-08 19:17:07 -0400 (Fri, 08 Apr 2016) | 8 lines
-
-[src/mpfr-impl.h] Removed the detection of possible inconsistencies
-under Unix because the tests could yield spurious errors with Cygwin
-or other similar implementations. Moreover, such tests were used for
-debugging purpose or to detect potential problems in the environment,
-thus were not really useful for the end user. They were initially
-added in the win-thread-safe-dll branch (r9682, following a problem
-found in r9680). One alternative for checking by the MPFR developers
-would be to output the status of some internal macros in tversion.
-
-Index: src/mpfr-impl.h
-===================================================================
---- src/mpfr-impl.h (revision 10259)
-+++ src/mpfr-impl.h (revision 10260)
-@@ -208,19 +208,6 @@ typedef struct __gmpfr_cache_s *mpfr_cac
- # define MPFR_WIN_THREAD_SAFE_DLL 1
- #endif
-
--/* Detect some possible inconsistencies under Unix. */
--#if defined(__unix__)
--# if defined(_WIN32)
--# error "Both __unix__ and _WIN32 are defined"
--# endif
--# if __GMP_LIBGMP_DLL
--# error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
--# endif
--# if defined(MPFR_WIN_THREAD_SAFE_DLL)
--# error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
--# endif
--#endif
--
- #if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
- extern MPFR_THREAD_ATTR mpfr_flags_t __gmpfr_flags;
- extern MPFR_THREAD_ATTR mpfr_exp_t __gmpfr_emin;
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
deleted file mode 100644
index 6f0ca1f6c80..00000000000
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit libtool multilib multilib-minimal preserve-libs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- epatch "${WORKDIR}"/${MY_P}-patchset/patch$(printf '%02d' ${i})
- done
- fi
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf \
- --docdir="\$(datarootdir)/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-
- # clean up html/license install
- pushd "${ED}"/usr/share/doc/${PF} >/dev/null
- dohtml *.html
- rm COPYING* *.html || die
- popd >/dev/null
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
deleted file mode 100644
index 6067024dc29..00000000000
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
- done
- fi
- epatch "${FILESDIR}"/${P}-cygwin.patch #579840
- epatch_user
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf \
- --docdir="\$(datarootdir)/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-
- # clean up html/license install
- pushd "${ED}"/usr/share/doc/${PF} >/dev/null
- dohtml *.html
- rm COPYING* *.html || die
- popd >/dev/null
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
deleted file mode 100644
index d10f7c6a648..00000000000
--- a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- epatch "${WORKDIR}"/${MY_P}-patchset/patch$(printf '%02d' ${i})
- done
- fi
- epatch_user
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf \
- --docdir="\$(datarootdir)/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-
- # clean up html/license install
- pushd "${ED}"/usr/share/doc/${PF} >/dev/null || die
- dohtml *.html && rm COPYING* *.html
- popd >/dev/null || die
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
deleted file mode 100644
index 08d0a46081e..00000000000
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
- done
- fi
- epatch_user
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf \
- --docdir="\$(datarootdir)/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-
- # clean up html/license install
- pushd "${ED}"/usr/share/doc/${PF} >/dev/null || die
- dohtml *.html && rm COPYING* *.html
- popd >/dev/null || die
-}
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
deleted file mode 100644
index 578353773d4..00000000000
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit libtool multilib-minimal preserve-libs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- eapply "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
- done
- fi
- eapply_user
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- rm "${ED}"/usr/share/doc/"${P}"/COPYING*
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
deleted file mode 100644
index 578353773d4..00000000000
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit libtool multilib-minimal preserve-libs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_prepare() {
- if [[ ${PLEVEL} != ${PV} ]] ; then
- local i
- for (( i = 1; i <= PLEVEL; ++i )) ; do
- eapply "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
- done
- fi
- eapply_user
- find . -type f -exec touch -r configure {} +
- elibtoolize
-}
-
-multilib_src_configure() {
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
- ECONF_SOURCE=${S} \
- user_redefine_cc=yes \
- econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- rm "${ED}"/usr/share/doc/"${P}"/COPYING*
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/
@ 2021-11-07 18:29 Andreas K. Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Hüttel @ 2021-11-07 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 01b37fc251ee234dec9c6c63ab6fad1e8a5626ef
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 18:29:30 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 18:29:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b37fc2
dev-libs/mpfr: Don't call makeinfo, forbidden during bootstrap
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...mpfr-4.1.0_p13-revert-doc-changes-patch10.patch | 105 ---------------------
dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild | 13 ++-
2 files changed, 9 insertions(+), 109 deletions(-)
diff --git a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch b/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch
deleted file mode 100644
index 304cc27f3fa..00000000000
--- a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Sat, 6 Nov 2021 00:34:22 +0000
-Subject: [PATCH] Revert doc changes from mpfr-4.1.0-patch10
-
-We don't want to invoke texinfo via maintainer-mode because
-of some (somewhat minor) changes to the manual from patch10.
-
-See: https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
-Signed-off-by: Sam James <sam@gentoo.org>
----
- doc/mpfr.info | 46 +++++++++++++++++++++-------------------------
- doc/mpfr.texi | 6 ------
- 2 files changed, 21 insertions(+), 31 deletions(-)
-
-diff --git a/doc/mpfr.info b/doc/mpfr.info
-index 062c0c4..264896d 100644
---- a/doc/mpfr.info
-+++ b/doc/mpfr.info
-@@ -3217,11 +3217,7 @@ destroying, garbaging) is left to the application.
-
- Each function in this interface is also implemented as a macro for
- efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the
--macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that
--the macro may evaluate arguments multiple times (or none). Moreover,
--macros implementing functions with the ‘void’ return type may not be
--used in contexts where an expression is expected, e.g., inside
--‘for(...)’ or before a comma operator.
-+macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.
-
- Note 1: MPFR functions may still initialize temporary floating-point
- numbers using ‘mpfr_init’ and similar functions. See Custom Allocation
-@@ -4583,13 +4579,13 @@ Function and Type Index
- (line 115)
- * mpfr_csch: Transcendental Functions.
- (line 180)
--* mpfr_custom_get_exp: Custom Interface. (line 80)
--* mpfr_custom_get_kind: Custom Interface. (line 70)
--* mpfr_custom_get_significand: Custom Interface. (line 75)
--* mpfr_custom_get_size: Custom Interface. (line 41)
--* mpfr_custom_init: Custom Interface. (line 45)
--* mpfr_custom_init_set: Custom Interface. (line 52)
--* mpfr_custom_move: Custom Interface. (line 89)
-+* mpfr_custom_get_exp: Custom Interface. (line 76)
-+* mpfr_custom_get_kind: Custom Interface. (line 66)
-+* mpfr_custom_get_significand: Custom Interface. (line 71)
-+* mpfr_custom_get_size: Custom Interface. (line 37)
-+* mpfr_custom_init: Custom Interface. (line 41)
-+* mpfr_custom_init_set: Custom Interface. (line 48)
-+* mpfr_custom_move: Custom Interface. (line 85)
- * MPFR_DECL_INIT: Initialization Functions.
- (line 77)
- * mpfr_digamma: Transcendental Functions.
-@@ -5169,19 +5165,19 @@ Node: Exception Related Functions\x7f145661
- Node: Memory Handling Functions\x7f155904
- Node: Compatibility with MPF\x7f157792
- Node: Custom Interface\x7f160961
--Node: Internals\x7f165852
--Node: API Compatibility\x7f167396
--Node: Type and Macro Changes\x7f169344
--Node: Added Functions\x7f172527
--Node: Changed Functions\x7f177334
--Node: Removed Functions\x7f184693
--Node: Other Changes\x7f185423
--Node: MPFR and the IEEE 754 Standard\x7f187124
--Node: Contributors\x7f189741
--Node: References\x7f192880
--Node: GNU Free Documentation License\x7f194761
--Node: Concept Index\x7f217355
--Node: Function and Type Index\x7f223428
-+Node: Internals\x7f165592
-+Node: API Compatibility\x7f167136
-+Node: Type and Macro Changes\x7f169084
-+Node: Added Functions\x7f172267
-+Node: Changed Functions\x7f177074
-+Node: Removed Functions\x7f184433
-+Node: Other Changes\x7f185163
-+Node: MPFR and the IEEE 754 Standard\x7f186864
-+Node: Contributors\x7f189481
-+Node: References\x7f192620
-+Node: GNU Free Documentation License\x7f194501
-+Node: Concept Index\x7f217095
-+Node: Function and Type Index\x7f223168
- \x1f
- End Tag Table
-
-diff --git a/doc/mpfr.texi b/doc/mpfr.texi
-index b26555a..54b6aa8 100644
---- a/doc/mpfr.texi
-+++ b/doc/mpfr.texi
-@@ -3817,12 +3817,6 @@ to the application.
- Each function in this interface is also implemented as a macro for
- efficiency reasons: for example @code{mpfr_custom_init (s, p)}
- uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function.
--Note that the macro may evaluate arguments multiple times (or none).
--Moreover, macros implementing functions with the @code{void} return type
--may not be used in contexts where an expression is expected, e.g., inside
--@code{for(...)} or before a comma operator.
--@c These limitations with macros cannot be avoided in a C90 compatible way.
--@c In the future, inline functions could be used.
-
- Note 1: MPFR functions may still initialize temporary floating-point numbers
- using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@.
---
-2.33.1
-
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
index 5907ed5bf1a..14639036b47 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -47,14 +47,19 @@ PATCHES=()
if [[ ${PV} == *_p* ]] ; then
# Apply the upstream patches released out of band
PATCHES+=( "${DISTDIR}"/ )
-
- # One-off partial revert of 4.1.0_p13's patch10
- # Won't be needed on next release.
- PATCHES+=( "${FILESDIR}"/${P}-revert-doc-changes-patch10.patch )
fi
HTML_DOCS=( doc/FAQ.html )
+src_prepare() {
+ default
+
+ # 4.1.0_p13's patch10 patches a .texi file *and* the corresponding
+ # info file. We need to make sure the info file is newer, so the
+ # build doesn't try to run makeinfo. Won't be needed on next release.
+ touch "${S}/doc/mpfr.info" || die
+}
+
multilib_src_configure() {
# bug 476336#19
# Make sure mpfr doesn't go probing toolchains it shouldn't
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/
@ 2022-11-22 18:50 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-11-22 18:50 UTC (permalink / raw
To: gentoo-commits
commit: bb48158fa851ab5f552b125de478a60b5bef65f7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 18:49:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 18:50:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb48158f
dev-libs/mpfr: backport mpfr_custom_get_kind macro fix
Closes: https://bugs.gentoo.org/881995
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mpfr-4.1.1-fix-mpfr_custom_get_kind.patch | 79 ++++++++++++++++++++++
.../{mpfr-4.1.1.ebuild => mpfr-4.1.1-r1.ebuild} | 1 +
2 files changed, 80 insertions(+)
diff --git a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
new file mode 100644
index 000000000000..d2521f2fa632
--- /dev/null
+++ b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/881995
+https://gitlab.inria.fr/mpfr/mpfr/-/commit/3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6
+https://gitlab.inria.fr/mpfr/mpfr/-/issues/1
+https://github.com/CGAL/cgal/issues/7064
+
+From 3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6 Mon Sep 17 00:00:00 2001
+From: Vincent Lefevre <vincent@vinc17.net>
+Date: Tue, 22 Nov 2022 16:33:00 +0100
+Subject: [PATCH] Fix mpfr_custom_get_kind() macro bug.
+
+* src/mpfr.h: in the mpfr_custom_get_kind() macro, changed mpfr_ptr to
+ mpfr_srcptr for _x to agree with the function prototype, in order to
+ avoid a compilation failure of user code in some cases. This bug was
+ introduced by commit 9f94e0311ed53d0c64d4fbca249d19cc4888027e, which
+ introduced the temporary variable _x to avoid an incorrect number of
+ evaluations of the x argument.
+* tests/tstckintc.c: improved the tests to detect this bug.
+
+This should fix mpfr bug #1.
+
+Bug initially reported by FX Coudert:
+ https://github.com/CGAL/cgal/issues/7064
+
+It affects Fedora Linux:
+ https://bugzilla.redhat.com/show_bug.cgi?id=2144197
+
+(cherry picked from commit 0ce17bae34a6c54de31b126f969d3ddd72c6bc37)
+--- a/src/mpfr.h
++++ b/src/mpfr.h
+@@ -1027,7 +1027,7 @@ __MPFR_DECLSPEC int mpfr_total_order_p (mpfr_srcptr, mpfr_srcptr);
+ #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
+ #define mpfr_custom_get_kind(x) \
+ __extension__ ({ \
+- mpfr_ptr _x = (x); \
++ mpfr_srcptr _x = (x); \
+ _x->_mpfr_exp > __MPFR_EXP_INF ? \
+ (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \
+ : _x->_mpfr_exp == __MPFR_EXP_INF ? \
+--- a/tests/tstckintc.c
++++ b/tests/tstckintc.c
+@@ -295,14 +295,16 @@ static void
+ test_nan_inf_zero (void)
+ {
+ mpfr_ptr val;
++ mpfr_srcptr sval; /* for compilation error checking */
+ int sign;
+ int kind;
+
+ reset_stack ();
+
+ val = new_mpfr (MPFR_PREC_MIN);
++ sval = val;
+ mpfr_set_nan (val);
+- kind = (mpfr_custom_get_kind) (val);
++ kind = (mpfr_custom_get_kind) (sval);
+ if (kind != MPFR_NAN_KIND)
+ {
+ printf ("mpfr_custom_get_kind error: ");
+@@ -380,7 +382,8 @@ static long *
+ dummy_set_si (long si)
+ {
+ mpfr_t x;
+- long * r = dummy_new ();
++ mpfr_srcptr px; /* for compilation error checking */
++ long *r = dummy_new ();
+ int i1, i2, i3, i4, i5;
+
+ /* Check that the type "void *" can be used, like with the function.
+@@ -405,7 +408,8 @@ dummy_set_si (long si)
+ MPFR_ASSERTN (i5 == 1);
+
+ mpfr_set_si (x, si, MPFR_RNDN);
+- r[0] = mpfr_custom_get_kind (x);
++ px = x;
++ r[0] = mpfr_custom_get_kind (px);
+
+ /* Check that the type "void *" can be used in C, like with the function
+ (forbidden in C++). Also check side effects. */
+GitLab
diff --git a/dev-libs/mpfr/mpfr-4.1.1.ebuild b/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
similarity index 98%
rename from dev-libs/mpfr/mpfr-4.1.1.ebuild
rename to dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
index 13392ae4cf60..e34c78ab5b44 100644
--- a/dev-libs/mpfr/mpfr-4.1.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${MY_PATCHES[@]}"
# Additional patches
+ "${FILESDIR}"/${P}-fix-mpfr_custom_get_kind.patch
)
HTML_DOCS=( doc/FAQ.html )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/
@ 2022-11-24 7:21 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-11-24 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 901acc0c32ffdbcd6f7dad926bd7ae215f59f32c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 07:06:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 07:20:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901acc0c
dev-libs/mpfr: add 4.1.1_p1, drop 4.1.1-r1
Bug: https://bugs.gentoo.org/881995
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/mpfr/Manifest | 1 +
.../mpfr-4.1.1-fix-mpfr_custom_get_kind.patch | 79 ----------------------
.../{mpfr-4.1.1-r1.ebuild => mpfr-4.1.1_p1.ebuild} | 1 -
3 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 98c281833584..979db7ba2241 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -12,4 +12,5 @@ DIST mpfr-4.1.0-patch11.patch 4584 BLAKE2B 4ba240e7e8acc360eb2f05186493fd9044c8f
DIST mpfr-4.1.0-patch12.patch 6768 BLAKE2B 15ce68eb9941ac5d6544ee18a062cb12026e07273a5424b3941596a1024f54cf5481363e145cac9375e518ec2033db82d4fe9152884c74a9037a81fd2c405b5e SHA512 4e91cffa0df911d68931ace13e86e420ec9f7d8e8a0279e12d995bbf8061b6bec90cb03ef8642a854f652907b13e533b7afb95f2279cf2dfa4010ec5d745ac3c
DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcbe4e1b04842fdb3549352a43607d44d58120e38bf448ffd33e36bab7f7cfd4ab65b2eb3aac2fe9bbd86d8f425f5a SHA512 ddd5f54d12584b6e10fd4eba12b8568c5286dba10bd3b5cdd429415b78bc827bd0ed3957bd06ca4c2c63a2f5e877fd9d86eebade8929d61aafe84ace8454d016
DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
+DIST mpfr-4.1.1-patch01.patch 2985 BLAKE2B d6bed1d6fca2319db457096a81aca060c1bd934fcdf9c5f98ba44920a7e97c2a5e9c539ec554feb723fb98c84096e1cb615c0d973133c67f3c2097edc1c5b803 SHA512 aa98173d59a24d0f59acff0c2143db5623746db3f6445e300a018a124b35a6b57d631c357a9a890f23c748591f621a95d3a801bed7341b6c8b6ddcc86ecfb107
DIST mpfr-4.1.1.tar.xz 1429836 BLAKE2B ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0 SHA512 be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1
diff --git a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
deleted file mode 100644
index d2521f2fa632..000000000000
--- a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://bugs.gentoo.org/881995
-https://gitlab.inria.fr/mpfr/mpfr/-/commit/3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6
-https://gitlab.inria.fr/mpfr/mpfr/-/issues/1
-https://github.com/CGAL/cgal/issues/7064
-
-From 3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6 Mon Sep 17 00:00:00 2001
-From: Vincent Lefevre <vincent@vinc17.net>
-Date: Tue, 22 Nov 2022 16:33:00 +0100
-Subject: [PATCH] Fix mpfr_custom_get_kind() macro bug.
-
-* src/mpfr.h: in the mpfr_custom_get_kind() macro, changed mpfr_ptr to
- mpfr_srcptr for _x to agree with the function prototype, in order to
- avoid a compilation failure of user code in some cases. This bug was
- introduced by commit 9f94e0311ed53d0c64d4fbca249d19cc4888027e, which
- introduced the temporary variable _x to avoid an incorrect number of
- evaluations of the x argument.
-* tests/tstckintc.c: improved the tests to detect this bug.
-
-This should fix mpfr bug #1.
-
-Bug initially reported by FX Coudert:
- https://github.com/CGAL/cgal/issues/7064
-
-It affects Fedora Linux:
- https://bugzilla.redhat.com/show_bug.cgi?id=2144197
-
-(cherry picked from commit 0ce17bae34a6c54de31b126f969d3ddd72c6bc37)
---- a/src/mpfr.h
-+++ b/src/mpfr.h
-@@ -1027,7 +1027,7 @@ __MPFR_DECLSPEC int mpfr_total_order_p (mpfr_srcptr, mpfr_srcptr);
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #define mpfr_custom_get_kind(x) \
- __extension__ ({ \
-- mpfr_ptr _x = (x); \
-+ mpfr_srcptr _x = (x); \
- _x->_mpfr_exp > __MPFR_EXP_INF ? \
- (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \
- : _x->_mpfr_exp == __MPFR_EXP_INF ? \
---- a/tests/tstckintc.c
-+++ b/tests/tstckintc.c
-@@ -295,14 +295,16 @@ static void
- test_nan_inf_zero (void)
- {
- mpfr_ptr val;
-+ mpfr_srcptr sval; /* for compilation error checking */
- int sign;
- int kind;
-
- reset_stack ();
-
- val = new_mpfr (MPFR_PREC_MIN);
-+ sval = val;
- mpfr_set_nan (val);
-- kind = (mpfr_custom_get_kind) (val);
-+ kind = (mpfr_custom_get_kind) (sval);
- if (kind != MPFR_NAN_KIND)
- {
- printf ("mpfr_custom_get_kind error: ");
-@@ -380,7 +382,8 @@ static long *
- dummy_set_si (long si)
- {
- mpfr_t x;
-- long * r = dummy_new ();
-+ mpfr_srcptr px; /* for compilation error checking */
-+ long *r = dummy_new ();
- int i1, i2, i3, i4, i5;
-
- /* Check that the type "void *" can be used, like with the function.
-@@ -405,7 +408,8 @@ dummy_set_si (long si)
- MPFR_ASSERTN (i5 == 1);
-
- mpfr_set_si (x, si, MPFR_RNDN);
-- r[0] = mpfr_custom_get_kind (x);
-+ px = x;
-+ r[0] = mpfr_custom_get_kind (px);
-
- /* Check that the type "void *" can be used in C, like with the function
- (forbidden in C++). Also check side effects. */
-GitLab
diff --git a/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
similarity index 98%
rename from dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
rename to dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
index e34c78ab5b44..13392ae4cf60 100644
--- a/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
@@ -47,7 +47,6 @@ PATCHES=(
"${MY_PATCHES[@]}"
# Additional patches
- "${FILESDIR}"/${P}-fix-mpfr_custom_get_kind.patch
)
HTML_DOCS=( doc/FAQ.html )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-24 7:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-13 14:34 [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/, dev-libs/mpfr/files/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2020-03-01 20:40 Sergei Trofimovich
2021-11-07 18:29 Andreas K. Hüttel
2022-11-22 18:50 Sam James
2022-11-24 7:21 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox