From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- sci-libs/fftw/Manifest | 4 ++-- sci-libs/fftw/fftw-3.3.9.ebuild | 33 +++++---------------------------- sci-libs/fftw/fftw-9999.ebuild | 35 ++++++++--------------------------- 3 files changed, 15 insertions(+), 57 deletions(-) (limited to 'sci-libs/fftw') diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 69e3458e77e7..68d6ce49f1b1 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -9,6 +9,6 @@ DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb EBUILD fftw-3.3.8-r1.ebuild 4631 BLAKE2B eb2025e5b4a8a8c2d0aa26fbdc2f2475fcf877b2f6d19533016d5bef0108f4afdef8161b296a2b0b25bd4a28a60285e664b614f61bd0278fcdc8831a9df5edcf SHA512 bfaa6b2d5c30153378e13fa1910baa514b4243bdd441a3165e74ead0e5035e928c9952494933c488f25cf6df23fc681f9ca26aa0316b0dedba44741e1aa9564f -EBUILD fftw-3.3.9.ebuild 4592 BLAKE2B fab7b64d667c07dec3c2204c621f679e1d4038b24b2f5b9322594a92bbf9383100dcc14f1683f7c6e3355a8beba5e8684487dff6754956e8266ab3884dcee9a3 SHA512 c2c391f4573f24c45d4135b906f8cfacba43b36e6c285a72033b67711201408f8097f5ade9874c0f8e2f9828cede3f590c42ef310fce031a320197013cac57d7 -EBUILD fftw-9999.ebuild 4466 BLAKE2B 71d76945629eaf3870146179acfae33728936afd001dbf9321c0ba3952de0bec3c3da4237640aa314d0e3020c863211153530525cc2a7599b829ec1909fad5c4 SHA512 dae624975a94cf5244ddaa294f06af2f673454289ddc1725c14ff58a1474effe5104dc3d13e97833ec5b8cd5b89dd6ed98fb17e64a8a51d53f2f260fbe3a96d3 +EBUILD fftw-3.3.9.ebuild 4058 BLAKE2B bca276edab24c3271775b1781d1361b71e9aba6148b3e07296d0950a4d7382bddc6de060e44aee20d191273364d3296de0bdfcf8807cb79d8524b519e9890e7c SHA512 3ebb2367dd9bf52e75759906d5efdeaca134f1c9421eacc55ebc9adc9a56df973409148568862b29a6527ced4b62ef62e269073b73264db272ca0124707a650f +EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98 diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild index 3db0c3fc13c1..5b57691cc1b9 100644 --- a/sci-libs/fftw/fftw-3.3.9.ebuild +++ b/sci-libs/fftw/fftw-3.3.9.ebuild @@ -17,19 +17,18 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" else SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="GPL-2+" SLOT="3.0/3" -IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus" +IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus" RESTRICT="!test? ( test )" RDEPEND=" mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=" - quad? ( sys-devel/gcc[fortran] ) test? ( dev-lang/perl )" S="${WORKDIR}/${MY_P}" @@ -46,15 +45,7 @@ pkg_setup() { fi fortran-2_pkg_setup - MULTIBUILD_VARIANTS=( single double longdouble ) - if use quad; then - if ! tc-is-gcc; then - ewarn "quad precision only available for gcc >= 4.6" - die "need quad precision capable gcc" - fi - MULTIBUILD_VARIANTS+=( quad ) - fi } src_prepare() { @@ -65,16 +56,6 @@ src_prepare() { } multilib_src_configure() { - # jlec reported USE=quad on abi_x86_32 has too few registers - # stub Makefiles - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then - mkdir -p "${BUILD_DIR}/tests" || die - echo "all: ;" > "${BUILD_DIR}/Makefile" || die - echo "install: ;" >> "${BUILD_DIR}/Makefile" || die - echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die - return 0 - fi - local myconf=( --enable-shared --disable-static @@ -86,6 +67,9 @@ multilib_src_configure() { ) [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode ) + # --enable-quad-precision is a brittle feature that requires + # __float128 support from the toolchain, which is lacking on + # most niche architectures. Bug #770346 case "${MULTIBUILD_ID}" in single-*) # altivec, sse, single-paired only work for single @@ -117,13 +101,6 @@ multilib_src_configure() { ) ;; - quad-*) - # quad does not support mpi - myconf+=( - --enable-quad-precision - ) - ;; - *) die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild" ;; diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index b0c692bdeac9..23c52fd7f3d2 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -22,14 +22,13 @@ fi LICENSE="GPL-2+" SLOT="3.0/3" -IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus" +IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus" RESTRICT="!test? ( test )" RDEPEND=" mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=" - quad? ( sys-devel/gcc[fortran] ) test? ( dev-lang/perl )" S="${WORKDIR}/${MY_P}" @@ -46,15 +45,7 @@ pkg_setup() { fi fortran-2_pkg_setup - MULTIBUILD_VARIANTS=( single double longdouble ) - if use quad; then - if ! tc-is-gcc; then - ewarn "quad precision only available for gcc >= 4.6" - die "need quad precision capable gcc" - fi - MULTIBUILD_VARIANTS+=( quad ) - fi } src_prepare() { @@ -65,16 +56,6 @@ src_prepare() { } multilib_src_configure() { - # jlec reported USE=quad on abi_x86_32 has too few registers - # stub Makefiles - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then - mkdir -p "${BUILD_DIR}/tests" || die - echo "all: ;" > "${BUILD_DIR}/Makefile" || die - echo "install: ;" >> "${BUILD_DIR}/Makefile" || die - echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die - return 0 - fi - local myconf=( --enable-shared --disable-static @@ -86,6 +67,9 @@ multilib_src_configure() { ) [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode ) + # --enable-quad-precision is a brittle feature that requires + # __float128 support from the toolchain, which is lacking on + # most niche architectures. Bug #770346 case "${MULTIBUILD_ID}" in single-*) # altivec, sse, single-paired only work for single @@ -117,13 +101,6 @@ multilib_src_configure() { ) ;; - quad-*) - # quad does not support mpi - myconf+=( - --enable-quad-precision - ) - ;; - *) die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild" ;; @@ -133,6 +110,10 @@ multilib_src_configure() { } src_configure() { + # upstream does not append proper -m flags + # https://bugs.gentoo.org/698572 + use cpu_flags_x86_avx2 && append-flags -mavx2 + multibuild_foreach_variant multilib-minimal_src_configure } -- cgit v1.2.3