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

diff --git a/sci-libs/fftw/fftw-3.3.5.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
similarity index 96%
rename from sci-libs/fftw/fftw-3.3.5.ebuild
rename to sci-libs/fftw/fftw-3.3.5-r1.ebuild
index 1218d51567e1af102d278d669172a07e136cfb21..ff0c93d32869aa5b305612bb15a1325e71866361 100644 (file)
--- a/sci-libs/fftw/fftw-3.3.5.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
 if [[ ${PV} = *9999 ]]; then
-       inherit autotools git-2
+       inherit autotools git-r3
        EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
        SRC_URI="http://www.fftw.org/${P}.tar.gz"
@@ -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}
                        )
                        ;;

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bb09666b045775e03085185cc73bb2fbb58edc8c..ff0c93d32869aa5b305612bb15a1325e71866361 100644 (file)
--- 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}
                        )
                        ;;