From 4db1c1b8c32706312d72ea7c6ca546cbaaaa7194 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 20 Oct 2021 12:21:39 +0000 Subject: [PATCH 1/3] net-dns/libidn2: Sync with Gentoo upstream Sync ebuild to upstream version to switch to EAPI=7, as previous EAPIs cause issues with multilib deps when running ./build_toolchains in the context of arm64 SDK. Upstream commit e4adffda16496e86a61020e8569c6974f8018983 --- .../portage-stable/net-dns/libidn2/Manifest | 4 +- ...idn2-2.3.0.ebuild => libidn2-2.3.2.ebuild} | 19 ++++-- .../net-dns/libidn2/libidn2-99999.ebuild | 66 ------------------- .../net-dns/libidn2/metadata.xml | 23 +++++-- 4 files changed, 30 insertions(+), 82 deletions(-) rename sdk_container/src/third_party/portage-stable/net-dns/libidn2/{libidn2-2.3.0.ebuild => libidn2-2.3.2.ebuild} (62%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest index 312cdf2cbb..21d2250311 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest @@ -1,2 +1,2 @@ -DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 -DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9 +DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1 +DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0 diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild index 74394fab9b..a0e563e610 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild @@ -1,29 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib-minimal +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc +inherit multilib-minimal toolchain-funcs verify-sig DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2" SRC_URI=" mirror://gnu/libidn/${P}.tar.gz + verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) " +S="${WORKDIR}"/${P/a/} LICENSE="GPL-2+ LGPL-3+" SLOT="0/2" -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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=" - dev-libs/libunistring[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-lang/perl sys-apps/help2man + verify-sig? ( app-crypt/openpgp-keys-libidn ) " -S=${WORKDIR}/${P/a/} src_prepare() { default @@ -40,6 +44,7 @@ src_prepare() { multilib_src_configure() { econf \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" \ $(use_enable static-libs static) \ --disable-doc \ --disable-gcc-warnings \ @@ -49,5 +54,5 @@ multilib_src_configure() { multilib_src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild deleted file mode 100644 index c678e41668..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-99999.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 multilib-minimal - -DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" -HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2" -EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/" -SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz" - -LICENSE="GPL-2+ LGPL-3+" -SLOT="0/2" -KEYWORDS="" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libunistring[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - dev-util/gengetopt - sys-apps/help2man -" -S=${WORKDIR}/${P/a/} - -src_unpack() { - git-r3_src_unpack - unpack ${A} -} - -src_prepare() { - mv "${WORKDIR}"/libunistring-0.9.10 unistring || die - - AUTORECONF=: sh bootstrap \ - --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po \ - || die - - default - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # Darwin ar chokes when TMPDIR doesn't exist (as done for some - # reason in the Makefile) - sed -i -e '/^TMPDIR = /d' Makefile.in || die - export TMPDIR="${T}" - fi - - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - $(use_enable static-libs static) \ - --disable-doc \ - --disable-gcc-warnings \ - --disable-gtk-doc -} - -multilib_src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml index 87360eddc9..6c92a6952c 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml @@ -1,10 +1,19 @@ - + - -jer@gentoo.org - - -cpe:/a:libidn2_project:libidn2 - + + mgorny@gentoo.org + Michał Górny + + + sam@gentoo.org + Sam James + + + toolchain@gentoo.org + Gentoo Toolchain Project + + + cpe:/a:libidn2_project:libidn2 + From e51102ad70f58c5c51c86b9d8001c6f92be3d19b Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 20 Oct 2021 12:21:39 +0000 Subject: [PATCH 2/3] dev-libs/mpc: Sync with Gentoo upstream Sync ebuild to upstream version to switch to EAPI=7, as previous EAPIs cause issues with multilib deps when running ./build_toolchains in the context of arm64 SDK. Upstream commit e4adffda16496e86a61020e8569c6974f8018983 --- .../portage-stable/dev-libs/mpc/Manifest | 3 +- .../mpc/files/mpc-1.0.3-mpfr-4.0.0.patch | 129 ------------------ .../dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch | 25 ---- .../portage-stable/dev-libs/mpc/metadata.xml | 2 +- .../dev-libs/mpc/mpc-1.0.3-r2.ebuild | 39 ------ .../dev-libs/mpc/mpc-1.0.3.ebuild | 33 ----- .../{mpc-1.1.0-r1.ebuild => mpc-1.2.1.ebuild} | 10 +- 7 files changed, 7 insertions(+), 234 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/mpc/{mpc-1.1.0-r1.ebuild => mpc-1.2.1.ebuild} (59%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/Manifest index f0edc3d40f..9c5ed85f34 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/Manifest @@ -1,2 +1 @@ -DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 -DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628 +DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch deleted file mode 100644 index 3a62d9bd20..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch +++ /dev/null @@ -1,129 +0,0 @@ -https://bugs.gentoo.org/642300 - -From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001 -From: Paul Zimmermann -Date: Sun, 10 Jan 2016 23:19:37 +0100 -Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr - ---- - configure.ac | 16 ++++++++++++++++ - src/mul.c | 15 ++++++++++++--- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b6fa199..bdb21ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,6 +165,22 @@ AC_LINK_IFELSE( - AC_MSG_ERROR([libmpfr not found or uses a different ABI (including static vs shared).]) - ]) - -+AC_MSG_CHECKING(for mpfr_fmma) -+LIBS="-lmpfr $LIBS" -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include "mpfr.h"]], -+ [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]] -+ )], -+ [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present]) -+ ], -+ [ -+ AC_MSG_RESULT(no) -+ AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma is not present]) -+ ]) -+ - # Check for a recent GMP - # We only guarantee that with a *functional* and recent enough GMP version, - # MPC will compile; we do not guarantee that GMP will compile. -diff --git a/src/mul.c b/src/mul.c -index 3c9c0a7..8c4afe4 100644 ---- a/src/mul.c -+++ b/src/mul.c -@@ -171,8 +171,9 @@ - } - - -+#if HAVE_MPFR_FMMA == 0 - static int --mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, -+mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, - mpfr_srcptr d, int sign, mpfr_rnd_t rnd) - { - /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0. -@@ -319,6 +320,7 @@ - - return inex; - } -+#endif - - - int -@@ -337,10 +339,17 @@ - else - rop [0] = z [0]; - -- inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), -- mpc_imagref (y), -1, MPC_RND_RE (rnd)), -+#if HAVE_MPFR_FMMA -+ inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), -+ mpc_imagref (y), MPC_RND_RE (rnd)), - mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), -+ mpc_realref (y), MPC_RND_IM (rnd))); -+#else -+ inex = MPC_INEX (mpc_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), -+ mpc_imagref (y), -1, MPC_RND_RE (rnd)), -+ mpc_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), - mpc_realref (y), +1, MPC_RND_IM (rnd))); -+#endif - - mpc_set (z, rop, MPC_RNDNN); - if (overlap) ---- a/configure -+++ b/configure -@@ -13835,6 +13835,41 @@ else - $as_echo "no" >&6; } - as_fn_error $? "libmpfr not found or uses a different ABI (including static vs shared)." "$LINENO" 5 - -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpfr_fmma" >&5 -+$as_echo_n "checking for mpfr_fmma... " >&6; } -+LIBS="-lmpfr $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include "mpfr.h" -+int -+main () -+{ -+mpfr_t x; mpfr_fmma (x, x, x, x, x, 0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define HAVE_MPFR_FMMA 1" >>confdefs.h -+ -+ -+else -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ -+$as_echo "#define HAVE_MPFR_FMMA 0" >>confdefs.h -+ -+ - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --- -2.15.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch deleted file mode 100644 index 445e941910..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch +++ /dev/null @@ -1,25 +0,0 @@ -mpfr-4.0.0 removed 'mpfr_add_one_ulp' and 'mpfr_sub_one_ulp' - -From 5eaa17651b759c7856a118835802fecbebcf46ad Mon Sep 17 00:00:00 2001 -From: Paul Zimmermann -Date: Wed, 4 Oct 2017 22:09:40 +0200 -Subject: [PATCH] replace obsolete mpfr_add_one_ulp/mpfr_sub_one_ulp functions - ---- - src/mpc-impl.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/mpc-impl.h b/src/mpc-impl.h -index 4026765..5420691 100644 ---- a/src/mpc-impl.h -+++ b/src/mpc-impl.h -@@ -60,2 +60,4 @@ along with this program. If not, see http://www.gnu.org/licenses/ . --#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN) --#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN) -+#define MPFR_ADD_ONE_ULP(x) \ -+ (mpfr_sgn (x) > 0 ? mpfr_nextabove (x) : mpfr_nextbelow (x)) -+#define MPFR_SUB_ONE_ULP(x) \ -+ (mpfr_sgn (x) > 0 ? mpfr_nextbelow (x) : mpfr_nextabove (x)) --- -2.15.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/metadata.xml index 67bd6a97db..e9de142372 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/metadata.xml @@ -1,5 +1,5 @@ - + toolchain@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3-r2.ebuild deleted file mode 100644 index f829188815..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils libtool multilib-minimal - -DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" -HOMEPAGE="http://mpc.multiprecision.org/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/3" -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" -IUSE="static-libs" - -DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?] - >=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-mpfr-4.0.0.patch - "${FILESDIR}"/${P}-no-ulp.patch -) - -src_prepare() { - default - - elibtoolize #347317 -} - -multilib_src_configure() { - ECONF_SOURCE=${S} econf $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3.ebuild deleted file mode 100644 index 584f40e71e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpc/mpc-1.0.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils libtool multilib-minimal - -DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" -HOMEPAGE="http://mpc.multiprecision.org/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="static-libs" - -DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?] - >=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?] - =dev-libs/mpfr-4.1.0:0=[${MULTILIB_USEDEP},static-libs?]" RDEPEND="${DEPEND}" multilib_src_configure() { From b61a41306a5531fda8abd2adcda75181653cbed7 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 20 Oct 2021 12:21:39 +0000 Subject: [PATCH 3/3] dev-libs/mpfr: Sync with Gentoo upstream Sync ebuild to upstream version to switch to EAPI=7, as previous EAPIs cause issues with multilib deps when running ./build_toolchains in the context of arm64 SDK. Upstream commit e4adffda16496e86a61020e8569c6974f8018983 --- .../portage-stable/dev-libs/mpfr/Manifest | 12 +--- .../mpfr/files/mpfr-3.1.4-cygwin.patch | 39 ------------ .../portage-stable/dev-libs/mpfr/metadata.xml | 2 +- .../dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild | 50 --------------- .../dev-libs/mpfr/mpfr-3.1.3_p4.ebuild | 62 ------------------- .../dev-libs/mpfr/mpfr-3.1.4.ebuild | 55 ---------------- .../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 | 60 ------------------ .../dev-libs/mpfr/mpfr-4.0.1.ebuild | 60 ------------------ .../dev-libs/mpfr/mpfr-4.0.2.ebuild | 60 ------------------ .../dev-libs/mpfr/mpfr-4.1.0-r1.ebuild | 32 ++++++++++ 12 files changed, 34 insertions(+), 507 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.6.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/Manifest index cee8cb9e96..77f8d18385 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/Manifest @@ -1,11 +1 @@ -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 +DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/files/mpfr-3.1.4-cygwin.patch deleted file mode 100644 index c051b4621b..0000000000 --- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/metadata.xml index e396f37559..5a1e1dee65 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/metadata.xml @@ -1,5 +1,5 @@ - + toolchain@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild deleted file mode 100644 index 7967195aea..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# this ebuild is only for the libmpfr.so.1 ABI SONAME - -EAPI="5" - -inherit eutils libtool multilib multilib-minimal flag-o-matic - -MY_PV=${PV/_p*} -MY_P=${PN}-${MY_PV} -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.bz2 - https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/gmp-4.1.4-r2:0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${WORKDIR}"/${MY_P}-patchset/patch* - sed -i '/if test/s:==:=:' configure #261016 - find . -type f -exec touch -r configure {} + - elibtoolize -} - -multilib_src_configure() { - # Newer gmp has deleted this define, so export it for older mpfr. - append-cppflags -D__gmp_const=const - # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 - ECONF_SOURCE=${S} \ - user_redefine_cc=yes \ - econf --disable-static -} - -multilib_src_compile() { - emake libmpfr.la -} - -multilib_src_install() { - emake DESTDIR="${D}" install-libLTLIBRARIES - rm -f "${ED}"/usr/*/libmpfr.{la,so,dylib,a} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild deleted file mode 100644 index e19a31cc85..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild +++ /dev/null @@ -1,62 +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 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-fbsd ~x86-fbsd ~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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.4.ebuild deleted file mode 100644 index f5a549273d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.4.ebuild +++ /dev/null @@ -1,55 +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-fbsd ~x86-fbsd ~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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild deleted file mode 100644 index bb73ce2d6a..0000000000 --- a/sdk_container/src/third_party/portage-stable/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-fbsd ~x86-fbsd ~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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.6.ebuild deleted file mode 100644 index 54529fa86a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-3.1.6.ebuild +++ /dev/null @@ -1,54 +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" - -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" -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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild deleted file mode 100644 index b15b4e64c7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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-fbsd ~x86-fbsd ~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 \ - --docdir="\$(datarootdir)/doc/${PF}" \ - $(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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.1.ebuild deleted file mode 100644 index b15b4e64c7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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-fbsd ~x86-fbsd ~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 \ - --docdir="\$(datarootdir)/doc/${PF}" \ - $(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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.2.ebuild deleted file mode 100644 index 02d1920bfc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.0.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 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-fbsd ~x86-fbsd ~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 \ - --docdir="\$(datarootdir)/doc/${PF}" \ - $(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/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild new file mode 100644 index 0000000000..986919466d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE="https://www.mpfr.org/" +SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0/6" # libmpfr.so version +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/FAQ.html ) + +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 +}