From 594dbc365403131e810db4c6980c533c97a6bb87 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Tue, 2 Aug 2016 10:10:41 +0200 Subject: sci-libs/fftw: Fix missing .so files due to incomplete autotools-utils.eclass porting * Also reintroduce USE="neon" flag Package-Manager: portage-2.3.0 --- sci-libs/fftw/fftw-3.3.5-r1.ebuild | 186 +++++++++++++++++++++++++++++++++++++ sci-libs/fftw/fftw-3.3.5.ebuild | 183 ------------------------------------ sci-libs/fftw/fftw-9999.ebuild | 5 +- 3 files changed, 190 insertions(+), 184 deletions(-) create mode 100644 sci-libs/fftw/fftw-3.3.5-r1.ebuild delete mode 100644 sci-libs/fftw/fftw-3.3.5.ebuild (limited to 'sci-libs') diff --git a/sci-libs/fftw/fftw-3.3.5-r1.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild new file mode 100644 index 000000000000..ff0c93d32869 --- /dev/null +++ b/sci-libs/fftw/fftw-3.3.5-r1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +FORTRAN_NEEDED=fortran + +inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal + +DESCRIPTION="Fast C library for the Discrete Fourier Transform" +HOMEPAGE="http://www.fftw.org/" + +if [[ ${PV} = *9999 ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" +else + SRC_URI="http://www.fftw.org/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +fi + +LICENSE="GPL-2+" +SLOT="3.0/3" +IUSE="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 neon openmp quad static-libs test threads zbus" + +RDEPEND=" + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + test? ( dev-lang/perl )" + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + if ! tc-has-openmp; then + ewarn "OpenMP is not available in your current selected compiler" + + if tc-is-clang; then + ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp," + ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\"" + fi + + die "need openmp capable compiler" + fi + FORTRAN_NEED_OPENMP=1 + fi + + fortran-2_pkg_setup + + MULTIBUILD_VARIANTS=( single double longdouble ) + if use quad; then + if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then + ewarn "quad precision only available for gcc >= 4.6" + die "need quad precision capable gcc" + fi + MULTIBUILD_VARIANTS+=( quad ) + fi +} + +src_prepare() { + default + + # fix info file for category directory + if [[ ${PV} = *9999 ]]; then + sed -i -e + 's/Texinfo documentation system/Libraries/' \ + doc/fftw3."info" || die "failed to fix info file" + + eautoreconf + fi +} + +multilib_src_configure() { + # there is no abi_x86_32 port of virtual/mpi right now, bug 519700 + local enable_mpi=$(multilib_native_use_enable mpi) + + # 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 + $(use_enable static-libs static) + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) + $(use_enable fortran) + $(use_enable zbus mips-zbus-timer) + $(use_enable threads) + $(use_enable openmp) + ) + case "${MULTIBUILD_ID}" in + single-*) + #altivec, sse, single-paired only work for single + myconf+=( + --enable-single + $(use_enable altivec) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_avx2 avx2) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable neon) + ${enable_mpi} + ) + ;; + + double-*) + myconf+=( + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_avx2 avx2) + $(use_enable cpu_flags_x86_sse2 sse2) + ${enable_mpi} + ) + ;; + + longdouble-*) + myconf+=( + --enable-long-double + ${enable_mpi} + ) + ;; + + quad-*) + #quad does not support mpi + myconf+=( + --enable-quad-precision + ) + ;; + + *) + die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild" + ;; + esac + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +src_configure() { + multibuild_foreach_variant multilib-minimal_src_configure +} + +src_compile() { + multibuild_foreach_variant multilib-minimal_src_compile +} + +multilib_src_test() { + emake -C tests smallcheck +} + +src_test() { + # We want this to be a reasonably quick test, but that is still hard... + ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" + # Do not increase the number of threads, it will not help your performance + # local testbase="perl check.pl --nthreads=1 --estimate" + # ${testbase} -${p}d || die "Failure: $n" + + multibuild_foreach_variant multilib-minimal_src_test +} + +src_install() { + DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS ) + HTML_DOCS=( doc/html/ ) + + multibuild_foreach_variant multilib-minimal_src_install + + if use doc; then + dodoc doc/*.pdf + docinto faq + dodoc -r doc/FAQ/fftw-faq.html/. + else + rm -r "${ED}"/usr/share/doc/${PF}/html || die + fi + + local x + for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do + local u + for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do + sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die + done + done + + # fftw uses pkg-config to record its private dependencies + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/fftw/fftw-3.3.5.ebuild b/sci-libs/fftw/fftw-3.3.5.ebuild deleted file mode 100644 index 1218d51567e1..000000000000 --- a/sci-libs/fftw/fftw-3.3.5.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -FORTRAN_NEEDED=fortran - -inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" - -if [[ ${PV} = *9999 ]]; then - inherit autotools git-2 - EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" -else - SRC_URI="http://www.fftw.org/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -fi - -LICENSE="GPL-2+" -SLOT="3.0/3" -IUSE="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 static-libs test threads zbus" - -RDEPEND=" - mpi? ( virtual/mpi )" -DEPEND="${RDEPEND} - test? ( dev-lang/perl )" - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - if ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected compiler" - - if tc-is-clang; then - ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp," - ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\"" - fi - - die "need openmp capable compiler" - fi - FORTRAN_NEED_OPENMP=1 - fi - - fortran-2_pkg_setup - - MULTIBUILD_VARIANTS=( single double longdouble ) - if use quad; then - if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then - ewarn "quad precision only available for gcc >= 4.6" - die "need quad precision capable gcc" - fi - MULTIBUILD_VARIANTS+=( quad ) - fi -} - -src_prepare() { - default - - # fix info file for category directory - if [[ ${PV} = *9999 ]]; then - sed -i -e - 's/Texinfo documentation system/Libraries/' \ - doc/fftw3."info" || die "failed to fix info file" - - eautoreconf - fi -} - -multilib_src_configure() { - # there is no abi_x86_32 port of virtual/mpi right now, bug 519700 - local enable_mpi=$(multilib_native_use_enable mpi) - - # 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=( - $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) - $(use_enable fortran) - $(use_enable zbus mips-zbus-timer) - $(use_enable threads) - $(use_enable openmp) - ) - case "${MULTIBUILD_ID}" in - single-*) - #altivec, sse, single-paired only work for single - myconf+=( - --enable-single - $(use_enable altivec) - $(use_enable cpu_flags_x86_avx avx) - $(use_enable cpu_flags_x86_avx2 avx2) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - ${enable_mpi} - ) - ;; - - double-*) - myconf+=( - $(use_enable cpu_flags_x86_avx avx) - $(use_enable cpu_flags_x86_avx2 avx2) - $(use_enable cpu_flags_x86_sse2 sse2) - ${enable_mpi} - ) - ;; - - longdouble-*) - myconf+=( - --enable-long-double - ${enable_mpi} - ) - ;; - - quad-*) - #quad does not support mpi - myconf+=( - --enable-quad-precision - ) - ;; - - *) - die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild" - ;; - esac - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -src_configure() { - multibuild_foreach_variant multilib-minimal_src_configure -} - -src_compile() { - multibuild_foreach_variant multilib-minimal_src_compile -} - -multilib_src_test() { - emake -C tests smallcheck -} - -src_test() { - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - # local testbase="perl check.pl --nthreads=1 --estimate" - # ${testbase} -${p}d || die "Failure: $n" - - multibuild_foreach_variant multilib-minimal_src_test -} - -src_install() { - DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS ) - HTML_DOCS=( doc/html/ ) - - multibuild_foreach_variant multilib-minimal_src_install - - if use doc; then - dodoc doc/*.pdf - docinto faq - dodoc -r doc/FAQ/fftw-faq.html/. - else - rm -r "${ED}"/usr/share/doc/${PF}/html || die - fi - - local x - for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do - local u - for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do - sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die - done - done - - # fftw uses pkg-config to record its private dependencies - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index bb09666b0457..ff0c93d32869 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="3.0/3" -IUSE="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 static-libs test threads zbus" +IUSE="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 neon openmp quad static-libs test threads zbus" RDEPEND=" mpi? ( virtual/mpi )" @@ -83,6 +83,8 @@ multilib_src_configure() { fi local myconf=( + --enable-shared + $(use_enable static-libs static) $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) $(use_enable fortran) $(use_enable zbus mips-zbus-timer) @@ -99,6 +101,7 @@ multilib_src_configure() { $(use_enable cpu_flags_x86_avx2 avx2) $(use_enable cpu_flags_x86_sse sse) $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable neon) ${enable_mpi} ) ;; -- cgit v1.2.3-65-gdbad