diff options
Diffstat (limited to 'sci-mathematics/gmp-ecm')
-rw-r--r-- | sci-mathematics/gmp-ecm/Manifest | 6 | ||||
-rw-r--r-- | sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch | 49 | ||||
-rw-r--r-- | sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch | 25 | ||||
-rw-r--r-- | sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 86 | ||||
-rw-r--r-- | sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 2 |
5 files changed, 2 insertions, 166 deletions
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest index 52116c38994d..ccece63f2d2b 100644 --- a/sci-mathematics/gmp-ecm/Manifest +++ b/sci-mathematics/gmp-ecm/Manifest @@ -1,7 +1,3 @@ -AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453 -AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554 -DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e -EBUILD gmp-ecm-7.0.4-r4.ebuild 2112 BLAKE2B 39830814297dce141346272456a9eb7af0ee7022f5e51721d613ed599939005c75c5d3a9454eb08c8686f053e6ae119a44cd65841bfa31368e9a6d7fd67b90cf SHA512 b8061d07de7ee3821746be174d88137e6cbf37f0e63947701fc52e957ae16f2e5595fdf6cbb452757c67fd5b2d666d7ff3e6afb6ff3adad01d7523efd615c695 -EBUILD gmp-ecm-7.0.5-r1.ebuild 1578 BLAKE2B 18ddfd53cfb8fd9ccf5a1965bd244d470e999f13545c6677380d5a06adee175d9850bc6e594c0a558058906e9b78fe85dd70055786fb1fd16cb6b2446a836b1a SHA512 f040160899338ea1ae04b9db451aa2e2060038c0319d9d0cd4fec20d380dd583133739d56ed83bb97fd498f0fb166574ab815205ed065a289aff373324354a66 +EBUILD gmp-ecm-7.0.5-r1.ebuild 1576 BLAKE2B 42687c4a488b0bb818092f4bb8b85074b64e96c5b2a315653967f154e2977e01638cf94f3839486a6380dc9d8115671223286eb2843e26cbccc7785e0ec89bfd SHA512 4e080d885b513aa25e7483f03440b754382780f14b5f2351d731230e6a994ec2b69ffc8e83226e0a66501a2b3fdf567908611ccc15bec6c8bfa4629bc745661e MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8 diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch deleted file mode 100644 index 6cca19161911..000000000000 --- a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/acinclude.m4 b/acinclude.m4 -index e92d2c9..b602f12 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -604,32 +604,3 @@ AC_SUBST(CUDALDFLAGS) - AC_SUBST(CUDARPATH) - - ]) -- --dnl Checks whether the stack can be marked nonexecutable by passing an option --dnl to the C-compiler when acting on .s files. Appends that option to ASMFLAGS. --dnl This macro is adapted from one found in GMP 6.1.1. --dnl FIXME: This test looks broken. It tests that a file with .note.GNU-stack... --dnl can be compiled/assembled with -Wa,--noexecstack. It does not determine --dnl if that command-line option has any effect on general asm code. --AC_DEFUN([CL_AS_NOEXECSTACK],[ --dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else --AC_CACHE_CHECK([whether assembler supports --noexecstack option], --cl_cv_as_noexecstack, [dnl -- cat > conftest.c <<EOF --void foo() {} --EOF -- if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -- -S -o conftest.s conftest.c >/dev/null]) \ -- && grep .note.GNU-stack conftest.s >/dev/null \ -- && AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack -- -c -o conftest.o conftest.s >/dev/null]) -- then -- cl_cv_as_noexecstack=yes -- else -- cl_cv_as_noexecstack=no -- fi -- rm -f conftest*]) -- if test "$cl_cv_as_noexecstack" = yes; then -- LIBECM_LDFLAGS="$LIBECM_LDFLAGS -Wl,-znoexecstack" -- fi --]) -diff --git a/configure.ac b/configure.ac -index 66a18dc..25b9aba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -590,7 +590,6 @@ error - fi - ;; - esac --CL_AS_NOEXECSTACK - AC_SUBST([LIBECM_LDFLAGS]) - - diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch deleted file mode 100644 index e382bf4ed28b..000000000000 --- a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch +++ /dev/null @@ -1,25 +0,0 @@ -# fix for https://bugs.gentoo.org/732032 merged upstream -diff --git a/pm1fs2.c b/pm1fs2.c -index 4471bf6..89f8077 100644 ---- a/pm1fs2.c -+++ b/pm1fs2.c -@@ -1562,17 +1562,16 @@ list_scale_V (listz_t R, const listz_t F, const mpres_t Q, - #pragma omp parallel if (deg > 1000) - { - mpmod_t modulus_local; -- long i; /* OpenMP insists on signed loop iteration var :( */ - - mpmod_init_set (modulus_local, modulus); - - #pragma omp for -- for (i = 0; (unsigned long) i <= 2 * deg - 2; i++) -+ for (i = 0; i <= 2 * deg - 2; i++) - mpres_mul_z_to_z (H[i], Vt, H[i], modulus_local); - mpmod_clear (modulus_local); - } - #else -- for (i = 0; (unsigned long) i <= 2 * deg - 2; i++) -+ for (i = 0; i <= 2 * deg - 2; i++) - mpres_mul_z_to_z (H[i], Vt, H[i], modulus); - #endif - diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild deleted file mode 100644 index 404d71631f44..000000000000 --- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -MY_PN="ecm" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Elliptic Curve Method for Integer Factorization" -HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm" -SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/${MY_P}.tar.gz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~ppc-macos ~x64-macos" -IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2" - -DEPEND="dev-libs/gmp:=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.4-openmp.patch - "${FILESDIR}"/${PN}-7.0.4-execstack.patch -) - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare(){ - default - - # patch the asm files - # create a sample with the assembly code needed - # Quote around # are needed because the files will be processed by M4. - cat <<-EOF > "${T}/sample.asm" - - \`#'if defined(__linux__) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits - \`#'endif - EOF - - # patch the asm files - cat "${T}/sample.asm" >> x86_64/mulredc1.asm - for i in {2..20} ; do - cat "${T}/sample.asm" >> x86_64/mulredc"$i".asm - cat "${T}/sample.asm" >> x86_64/mulredc1_"$i".asm - done - - eautoreconf -} - -src_compile() { - default - if use custom-tune; then - # One "emake" was needed to build the library. Now we can find - # the best set of parameters, and then run "emake" one more time - # to rebuild the library with the custom parameters. See the - # project's README or INSTALL-ecm. The build targets don't depend - # on ecm-params.h, so we need to "make clean" to force a rebuild. - emake ecm-params && emake clean && emake - fi -} - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable openmp) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable custom-tune asm-redc) -} - -src_install() { - default - - # remove .la file - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild index 4aebc124d873..d3b81e1bc203 100644 --- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild +++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220 LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos" IUSE="+custom-tune openmp cpu_flags_x86_sse2" DEPEND="dev-libs/gmp:=" |