diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/mpfr/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch | 39 | ||||
| -rw-r--r-- | dev-libs/mpfr/mpfr-4.0.2-r314.ebuild (renamed from dev-libs/mpfr/mpfr-3.1.6-r1337.ebuild) | 34 |
3 files changed, 20 insertions, 55 deletions
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest index 11a9ef19..f8323055 100644 --- a/dev-libs/mpfr/Manifest +++ b/dev-libs/mpfr/Manifest @@ -1 +1 @@ -DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 +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 c051b462..00000000 --- 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.6-r1337.ebuild b/dev-libs/mpfr/mpfr-4.0.2-r314.ebuild index 54529fa8..908b8e54 100644 --- a/dev-libs/mpfr/mpfr-3.1.6-r1337.ebuild +++ b/dev-libs/mpfr/mpfr-4.0.2-r314.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 # NOTE: we cannot depend on autotools here starting with gcc-4.3.x -inherit eutils libtool multilib-minimal +inherit libtool multilib-minimal preserve-libs MY_PV=${PV/_p*} MY_P=${PN}-${MY_PV} @@ -14,23 +14,25 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="0/6" # libmpfr.so version +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 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?]" +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 - epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i}) + eapply "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i}) done fi - epatch_user + eapply_user find . -type f -exec touch -r configure {} + elibtoolize } @@ -39,16 +41,18 @@ 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) + 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) +} - # clean up html/license install - pushd "${ED}"/usr/share/doc/${PF} >/dev/null || die - dohtml *.html && rm COPYING* *.html - popd >/dev/null || die +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4) } |