commit: 59d9451170d735877e7e49f39bfcd491d7e906ce
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:48:44 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 00:48:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d94511
sci-mathematics/gmp-ecm: drop 7.0.4-r4
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/gmp-ecm/Manifest | 1 -
.../gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch | 49 ------------
.../gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch | 25 -------
sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 86 ----------------------
4 files changed, 161 deletions(-)
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 0b39c18a6861..9eed31676504 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1 @@
-DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
SHA512
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B
7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f
SHA512
f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
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
-}
