Attachment 1779474 Details for Bug 1729652 – updated spec file v2

[patch] updated spec file v2

0001-fix-cmake-modules-and-various-.spec-cleanups_v2.patch (text/plain), 19.17 KB, created by Larry on 2021-05-04 17:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry

Created: 2021-05-04 17:56:07 UTC

Size: 19.17 KB

patch

obsolete

>From: Larry <larry@localhost>
>Subject: [PATCH] fix cmake modules and various .spec cleanups (v2)
>
>Changes
>1. BuildRequires cmake (autotools is still used for actual build)
>2. Refactor the build configuration logic to use a single source'd
>   file with environment variables
>3. allow individual disable/enable of single/double/long/quad
>4. run cmake configuration phase only during the build for each
>   variant. This generates the missing files needed to support
>   cmake projects which rely on find_package (instead of pkgconfig)
>   to import the fftw dependency.
>5. split the cmake modules into individual directories, one per
>   variant. The CMake module directory names take the form
>   `FFTW3{prec_suffix}`.
>
>I tested compilation with a toy cmake-based project which uses
>find_package to locate and link against fftw3. It built
>successfully against both the single and double versions.
>
>Compilation/rpmbuild with MPI was not tested since I'm not familiar
>with that area.
>
>To switch between the precision variants via cmake, one simply
>uses `find_package(FFTW3<suffix>)` where suffix is f/l/q for
>single/long/quad respectively, or with an empty suffix for the
>double variant.
>---
> fftw.spec | 354 ++++++++++++++++++++++++++++++++++++++++--------------
> 1 file changed, 264 insertions(+), 90 deletions(-)
>
>diff --git a/fftw.spec b/fftw.spec
>index fcd5125..7d8a278 100644
>--- a/fftw.spec
>+++ b/fftw.spec
>@@ -4,11 +4,16 @@
> %else
> %bcond_without openmpi
> %endif
>+
>+%global mpi 0
>+
> %if %{with mpich}
> %global mpi_list %{?mpi_list} mpich
>+%global mpi 1
> %endif
> %if %{with openmpi}
> %global mpi_list %{?mpi_list} openmpi
>+%global mpi 1
> %endif
>
>
>@@ -24,6 +29,9 @@ BuildRequires:  gcc-gfortran
> BuildRequires:  autoconf
> BuildRequires:  automake
> BuildRequires:  libtool
>+# BZ1729652: workaround for fftw (3.3.8). Building with autotools omits files
>+# necesary for functioning cmake support in devel package
>+BuildRequires:  cmake
>
> %global quad 0
> # Quad precision support only available with gcc >= 4.6 (Fedora >= 15)
>@@ -32,6 +40,11 @@ BuildRequires:  libtool
> %global quad 1
> %endif
>
>+# Enable all other precisions by default
>+%global single 1
>+%global double 1
>+%global long 1
>+
> # For check phase
> BuildRequires:  time
> BuildRequires:  perl-interpreter
>@@ -42,7 +55,7 @@ BuildRequires:  nss-myhostname
> %if %{with openmpi}
> BuildRequires:  openmpi-devel
> %endif
>-%if %{with mpich} || %{with openmpi}
>+%if %{mpi}
> BuildRequires:  environment-modules
> %endif
> BuildRequires: make
>@@ -61,9 +74,15 @@ Obsoletes:      fftw-libs-threads < %{version}-%{release}
> Obsoletes:      fftw-libs-openmp < %{version}-%{release}
>
> # Pull in the actual libraries
>+%if %{single}
> Requires:       %{name}-libs-single%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{double}
> Requires:       %{name}-libs-double%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{long}
> Requires:       %{name}-libs-long%{?_isa} = %{version}-%{release}
>+%endif
> %if %{quad}
> Requires:       %{name}-libs-quad%{?_isa} = %{version}-%{release}
> %endif
>@@ -95,18 +114,22 @@ Summary:        FFTW library, double precision
> %description libs-double
> This package contains the FFTW library compiled in double precision.
>
>+%if %{single}
> %package libs-single
> Summary:        FFTW library, single precision
>
> %description libs-single
> This package contains the FFTW library compiled in single precision.
>+%endif
>
>+%if %{long}
> %package libs-long
>-Summary:        FFTW library, long double precision
>+Summary:        FFTW library, long double precision
>
> %description libs-long
> This package contains the FFTW library compiled in long double
> precision.
>+%endif
>
> %if %{quad}
> %package libs-quad
>@@ -133,9 +156,15 @@ Summary:        FFTW MPICH run-time library
> Provides:       fftw3-mpich = %{version}-%{release}
>
> # Pull in the actual libraries
>+%if %{single}
> Requires:       %{name}-mpich-libs-single%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{double}
> Requires:       %{name}-mpich-libs-double%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{long}
> Requires:       %{name}-mpich-libs-long%{?_isa} = %{version}-%{release}
>+%endif
>
> %description mpich-libs
> This is a dummy package package, pulling in the individual FFTW
>@@ -166,20 +195,24 @@ Requires:       %{name}-libs-double%{?_isa} = %{version}-%{release}
> %description mpich-libs-double
> This package contains the FFTW MPICH library compiled in double precision.
>
>+%if %{single}
> %package mpich-libs-single
> Summary:        FFTW MPICH library, single precision
> Requires:       %{name}-libs-single%{?_isa} = %{version}-%{release}
>
> %description mpich-libs-single
> This package contains the FFTW MPICH library compiled in single precision.
>+%endif
>
>+%if %{long}
> %package mpich-libs-long
>-Summary:        FFTW MPICH library, long double precision
>+Summary:        FFTW MPICH library, long double precision
> Requires:       %{name}-libs-long%{?_isa} = %{version}-%{release}
>
> %description mpich-libs-long
> This package contains the FFTW MPICH library compiled in long double
> precision.
>+%endif
>
> %package        mpich-static
> Summary:        Static versions of the FFTW MPICH libraries
>@@ -199,9 +232,16 @@ Summary:        FFTW OpenMPI run-time library
> Provides:       fftw3-openmpi = %{version}-%{release}
>
> # Pull in the actual libraries
>+
>+%if %{single}
> Requires:       %{name}-openmpi-libs-single%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{double}
> Requires:       %{name}-openmpi-libs-double%{?_isa} = %{version}-%{release}
>+%endif
>+%if %{long}
> Requires:       %{name}-openmpi-libs-long%{?_isa} = %{version}-%{release}
>+%endif
>
> %description openmpi-libs
> This is a dummy package package, pulling in the individual FFTW
>@@ -232,20 +272,24 @@ Requires:       %{name}-libs-double%{?_isa} = %{version}-%{release}
> %description openmpi-libs-double
> This package contains the FFTW OpenMPI library compiled in double precision.
>
>+%if %{single}
> %package openmpi-libs-single
> Summary:        FFTW OpenMPI library, single precision
> Requires:       %{name}-libs-single%{?_isa} = %{version}-%{release}
>
> %description openmpi-libs-single
> This package contains the FFTW OpenMPI library compiled in single precision.
>+%endif
>
>+%if %{long}
> %package openmpi-libs-long
>-Summary:        FFTW OpenMPI library, long double precision
>+Summary:        FFTW OpenMPI library, long double precision
> Requires:       %{name}-libs-long%{?_isa} = %{version}-%{release}
>
> %description openmpi-libs-long
> This package contains the FFTW OpenMPI library compiled in long double
> precision.
>+%endif
>
> %package        openmpi-static
> Summary:        Static versions of the FFTW OpenMPI libraries
>@@ -269,39 +313,74 @@ library.
>
> %prep
> %setup -q
>-
>-%build
>-# Explicitly load shell support for the environment-modules package, used
>-# below via 'module' pseudo-command.
>-source /etc/profile.d/modules.sh
>-
> # Regenerate autoconf files using current tools so proper build flags
> # from redhat-rpm-config are used
> autoreconf -vfi
>-# Configure uses g77 by default, if present on system
>-export F77=gfortran
>
>-BASEFLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
>-BASEFLAGS+=" --enable-openmp"
>-
>-# Precisions to build
>+# generate env file for "source"-ing in each section of this rpm SPEC file
>+cat >RPM-envars<<EOF
> prec_name[0]=single
> prec_name[1]=double
> prec_name[2]=long
> prec_name[3]=quad
>
>-# Corresponding flags
> prec_flags[0]=--enable-single
>-prec_flags[1]=--enable-double
>+prec_flags[1]=
> prec_flags[2]=--enable-long-double
> prec_flags[3]=--enable-quad-precision
>
>+prec_cmake_flags[0]=-DENABLE_FLOAT=ON
>+prec_cmake_flags[1]=
>+prec_cmake_flags[2]=-DENABLE_LONG_DOUBLE=ON
>+prec_cmake_flags[3]=-DENABLE_QUAD_PRECISION=ON
>+
>+prec_suffix[0]=f
>+prec_suffix[1]=
>+prec_suffix[2]=l
>+prec_suffix[3]=q
>+
>+%if %{single}
>+prec_enabled[0]=1
>+%else
>+prec_enabled[0]=0
>+%endif
>+%if %{double}
>+prec_enabled[1]=1
>+%else
>+prec_enabled[1]=0
>+%endif
>+%if %{long}
>+prec_enabled[2]=1
>+%else
>+prec_enabled[2]=0
>+%endif
>+%if %{quad}
>+prec_enabled[3]=1
>+%else
>+prec_enabled[3]=0
>+%endif
>+
> %ifarch x86_64
> # Enable SSE2 and AVX support for x86_64
> for((i=0;i<2;i++)); do
>  prec_flags[i]+=" --enable-sse2 --enable-avx"
> done
> %endif
>+EOF
>+
>+%build
>+# Explicitly load shell support for the environment-modules package, used
>+# below via 'module' pseudo-command.
>+source /etc/profile.d/modules.sh
>+
>+# bring in definition for all the build configurations
>+source ./RPM-envars
>+
>+# Configure uses g77 by default, if present on system
>+export F77=gfortran
>+
>+BASEFLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
>+BASEFLAGS+=" --enable-openmp"
>
> # No NEON run time detection, not all ARM SoCs have NEON
> #%ifarch %{arm}
>@@ -319,74 +398,111 @@ done
> #%endif
>
> # Loop over precisions
>-%if %{quad}
> for((iprec=0;iprec<4;iprec++))
>-%else
>-for((iprec=0;iprec<3;iprec++))
>-%endif
> do
>- mkdir ${prec_name[iprec]}${ver_name[iver]}
>- cd ${prec_name[iprec]}${ver_name[iver]}
>- ln -s ../configure .
>- %{configure} ${BASEFLAGS} ${prec_flags[iprec]}
>- sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
>- sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
>- make %{?_smp_mflags}
>- cd ..
>-done
>-
>-# MPI Builds - this duplicates the non-mpi builds, but oh well
>-for mpi in %{mpi_list}
>-do
>- module load mpi/${mpi}-%{_arch}
>- # Loop over precisions - no quad precision support with MPI
>- for((iprec=0;iprec<3;iprec++))
>- do
>-  mkdir ${mpi}-${prec_name[iprec]}${ver_name[iver]}
>-  cd ${mpi}-${prec_name[iprec]}${ver_name[iver]}
>-  ln -s ../configure .
>-  # Force linking the _mpi.so libraries with the mpi libs.  This works because
>-  # we get rid of all of the non-mpi components of these builds
>-  export CC=mpicc
>-  %{configure} ${BASEFLAGS} ${prec_flags[iprec]} --enable-mpi \
>-   --libdir=%{_libdir}/$mpi/lib \
>-   --bindir=%{_libdir}/$mpi/bin \
>-   --sbindir=%{_libdir}/$mpi/sbin \
>-   --includedir=%{_includedir}/$mpi-%{_arch} \
>-   --mandir=%{_libdir}/$mpi/share/man
>+  if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+    echo "[build] Skipping ${prec_name[iprec]}";
>+    continue;
>+  fi;
>+  mkdir -p ${prec_name[iprec]}
>+  cd ${prec_name[iprec]}
>+  # generate some required cmake files not generated by autotools build
>+  cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ${prec_cmake_flags[iprec]} ..
>+  ln -sf ../configure .
>+  %{configure} ${BASEFLAGS} ${prec_flags[iprec]}
>+  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
>+  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
>   make %{?_smp_mflags}
>   cd ..
>- done
>- module unload mpi/${mpi}-%{_arch}
> done
>
>+# MPI Builds - this duplicates the non-mpi builds, but oh well
>+%if %{mpi}
>+for mpi in %{mpi_list}
>+do
>+  module load mpi/${mpi}-%{_arch}
>+  # Loop over precisions - no quad precision support with MPI
>+  for((iprec=0;iprec<4;iprec++))
>+  do
>+    if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+      echo "[build-mpi] Skipping ${prec_name[iprec]}";
>+      continue;
>+    fi;
>+    mkdir ${mpi}-${prec_name[iprec]}
>+    cd ${mpi}-${prec_name[iprec]}
>+    # generate some required cmake files not generated by autotools build
>+    cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ${prec_cmake_flags[iprec]} ..
>+    ln -s ../configure .
>+    # Force linking the _mpi.so libraries with the mpi libs.  This works because
>+    # we get rid of all of the non-mpi components of these builds
>+    export CC=mpicc
>+    %{configure} ${BASEFLAGS} ${prec_flags[iprec]} --enable-mpi \
>+     --libdir=%{_libdir}/$mpi/lib \
>+     --bindir=%{_libdir}/$mpi/bin \
>+     --sbindir=%{_libdir}/$mpi/sbin \
>+     --includedir=%{_includedir}/$mpi-%{_arch} \
>+     --mandir=%{_libdir}/$mpi/share/man
>+  done
>+  module unload mpi/${mpi}-%{_arch}
>+done
>+%endif
>
> %install
> # Explicitly load shell support for the environment-modules package, used
> # below via 'module' pseudo-command.
> source /etc/profile.d/modules.sh
>
>-%if %{quad}
>-for ver in single double long quad
>-%else
>-for ver in single double long
>-%endif
>+# bring in definition for all the build configurations
>+source ./RPM-envars
>+
>+for((iprec=0;iprec<4;iprec++))
> do
>- make -C $ver install DESTDIR=%{buildroot}
>+  if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+    echo "[install] Skipping ${prec_name[iprec]}";
>+    continue;
>+  fi;
>+  make -C ${prec_name[iprec]} install DESTDIR=%{buildroot}
>+  # copy some extra requires files which are generated by cmake into install directory
>+  cp ${prec_name[iprec]}/CMakeFiles/Export/lib64/cmake/fftw3${prec_suffix[iprec]}/*.cmake %{buildroot}/%{_libdir}/cmake/fftw3/
>+  # move the cmake files for each precision into their own directory.
>+  # cmake doesn't care about directory names when find_package is used.
>+  # It just searches for a <NAME>Config.cmake file
>+  mkdir -p %{buildroot}/%{_libdir}/cmake/fftw3/ %{buildroot}/%{_libdir}/cmake-final
>+  mv -f %{buildroot}/%{_libdir}/cmake/fftw3/ %{buildroot}/%{_libdir}/cmake-final/FFTW3${prec_suffix[iprec]}/
> done
>+
>+rm -rf %{buildroot}/%{_libdir}/cmake
>+mv %{buildroot}/%{_libdir}/cmake-final %{buildroot}/%{_libdir}/cmake
>+
> # MPI
>+%if %{mpi}
> for mpi in %{mpi_list}
> do
>- module load mpi/${mpi}-%{_arch}
>- for ver in single double long
>- do
>-  make -C ${mpi}-${ver} install DESTDIR=%{buildroot}
>-  # Remove duplicated non-mpi libraries, binaries, and data
>-  find %{buildroot}%{_libdir}/${mpi}/lib -name libfftw\* -a \! -name \*_mpi.\* -delete
>-  rm -r %{buildroot}%{_libdir}/${mpi}/{bin,share}
>- done
>- module unload mpi/${mpi}-%{_arch}
>+  module load mpi/${mpi}-%{_arch}
>+  for((iprec=0;iprec<4;iprec++))
>+  do
>+    if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+      echo "[install] Skipping ${prec_name[iprec]}";
>+      continue;
>+    fi;
>+    make -C ${mpi}-${prec_name[iprec]} install DESTDIR=%{buildroot}
>+    cp ${mpi}-${prec_name[iprec]}/CMakeFiles/Export/lib64/cmake/fftw3${prec_suffix[iprec]}/*.cmake %{buildroot}/%{_libdir}/${mpi}/cmake/fftw3/
>+    # move the cmake files for each precision into their own directory.
>+    # cmake doesn't care about directory names when find_package is used.
>+    # It just searches for a <NAME>Config.cmake file
>+    mkdir -p %{buildroot}/%{_libdir}/${mpi}/cmake/fftw3/ %{buildroot}/%{_libdir}/${mpi}/cmake-final
>+    mv -f %{buildroot}/%{_libdir}/${mpi}/cmake/fftw3/ %{buildroot}/%{_libdir}/${mpi}/cmake-final/FFTW3${prec_suffix[iprec]}/
>+    # Remove duplicated non-mpi libraries, binaries, and data
>+    find %{buildroot}%{_libdir}/${mpi}/lib -name libfftw\* -a \! -name \*_mpi.\* -delete
>+    rm -r %{buildroot}%{_libdir}/${mpi}/{bin,share}
>+  done
>+  rm -rf %{buildroot}%{_libdir}/${mpi}/cmake
>+  mv %{buildroot}%{_libdir}/${mpi}/cmake-final %{buildroot}%{_libdir}/${mpi}/cmake
>+  module unload mpi/${mpi}-%{_arch}
> done
>+%endif
>+
>+# remove nuisance files
> rm -f %{buildroot}%{_infodir}/dir
> find %{buildroot} -name \*.la -delete
>
>@@ -395,15 +511,18 @@ find %{buildroot} -name \*.la -delete
> # below via 'module' pseudo-command.
> source /etc/profile.d/modules.sh
>
>+# bring in definition for all the build configurations
>+source ./RPM-envars
>+
> bdir=`pwd`
>-%if %{quad}
>-for ver in single double long quad
>-%else
>-for ver in single double long
>-%endif
>-do
>- export LD_LIBRARY_PATH=$bdir/$ver/.libs:$bdir/$ver/threads/.libs
>- make %{?_smp_mflags} -C $ver check
>+for((iprec=0;iprec<4;iprec++))
>+do
>+  if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+    echo "[check] Skipping ${prec_name[iprec]}";
>+    continue;
>+  fi;
>+ export LD_LIBRARY_PATH=$bdir/${prec_name[iprec]}/.libs:$bdir/${prec_name[iprec]}/threads/.libs
>+ make %{?_smp_mflags} -C ${prec_name[iprec]} check
> done
> # MPI
> %if %{with openmpi}
>@@ -413,20 +532,31 @@ done
> export OMPI_MCA_btl="^vader"
> %endif
> %endif
>+
>+%if %{mpi}
> for mpi in %{mpi_list}
> do
>- module load mpi/${mpi}-%{_arch}
>- for ver in single double long
>- do
>-  export LD_LIBRARY_PATH=$bdir/$ver/.libs:$bdir/$ver/threads/.libs
>-  make %{?_smp_mflags} -C ${mpi}-${ver}/mpi check
>- done
>- module unload mpi/${mpi}-%{_arch}
>+  module load mpi/${mpi}-%{_arch}
>+  for((iprec=0;iprec<4;iprec++))
>+  do
>+    if [ x"${prec_enabled[iprec]}" != x"1" ]; then
>+      echo "[check-${mpi}] Skipping ${prec_name[iprec]}";
>+      continue;
>+    fi;
>+    export LD_LIBRARY_PATH=$bdir/${prec_name[iprec]}/.libs:$bdir/${prec_name[iprec]}/threads/.libs
>+    make %{?_smp_mflags} -C ${mpi}-${{prec_name[iprec]}}/mpi check
>+  done
>+  module unload mpi/${mpi}-%{_arch}
> done
>+%endif
>
>-%ldconfig_scriptlets libs-single
> %ldconfig_scriptlets libs-double
>+%if %{single}
>+%ldconfig_scriptlets libs-single
>+%endif
>+%if %{long}
> %ldconfig_scriptlets libs-long
>+%endif
> %if %{quad}
> %ldconfig_scriptlets libs-quad
> %endif
>@@ -437,26 +567,32 @@ done
>
> %files libs
>
>+%if %{single}
> %files libs-single
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/libfftw3f.so.*
> %{_libdir}/libfftw3f_threads.so.*
> %{_libdir}/libfftw3f_omp.so.*
>+%endif
>
>+%if %{double}
> %files libs-double
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/libfftw3.so.*
> %{_libdir}/libfftw3_threads.so.*
> %{_libdir}/libfftw3_omp.so.*
>+%endif
>
>+%if %{long}
> %files libs-long
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/libfftw3l.so.*
> %{_libdir}/libfftw3l_threads.so.*
> %{_libdir}/libfftw3l_omp.so.*
>+%endif
>
> %if %{quad}
> %files libs-quad
>@@ -467,12 +603,27 @@ done
> %{_libdir}/libfftw3q_omp.so.*
> %endif
>
>+
> %files devel
> %doc doc/FAQ/fftw-faq.html/
> %doc %{_infodir}/fftw3.info*
> %{_includedir}/fftw3*
>-%dir %{_libdir}/cmake/fftw3/
>-%{_libdir}/cmake/fftw3/*.cmake
>+%if %{single}
>+%dir %{_libdir}/cmake/FFTW3f/
>+%{_libdir}/cmake/FFTW3f/*.cmake
>+%endif
>+%if %{double}
>+%dir %{_libdir}/cmake/FFTW3/
>+%{_libdir}/cmake/FFTW3/*.cmake
>+%endif
>+%if %{long}
>+%dir %{_libdir}/cmake/FFTW3l/
>+%{_libdir}/cmake/FFTW3l/*.cmake
>+%endif
>+%if %{quad}
>+%dir %{_libdir}/cmake/FFTW3q/
>+%{_libdir}/cmake/FFTW3q/*.cmake
>+%endif
> %{_libdir}/pkgconfig/fftw3*.pc
> %{_libdir}/libfftw3*.so
>
>@@ -485,26 +636,45 @@ done
> %if %{with mpich}
> %files mpich-libs
>
>+%if %{single}
> %files mpich-libs-single
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/mpich/lib/libfftw3f_mpi.so.*
>-
>+%endif
>+%if %{double}
> %files mpich-libs-double
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/mpich/lib/libfftw3_mpi.so.*
>-
>+%endif
>+%if %{long}
> %files mpich-libs-long
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/mpich/lib/libfftw3l_mpi.so.*
>+%endif
>
> %files mpich-devel
> %doc doc/FAQ/fftw-faq.html/
> %{_includedir}/mpich-%{_arch}
>+%if %{single}
>+%dir %{_libdir}/mpich/lib/cmake/fftw3f/
>+%{_libdir}/mpich/lib/cmake/fftw3f/*.cmake
>+%endif
>+%if %{double}
> %dir %{_libdir}/mpich/lib/cmake/fftw3/
> %{_libdir}/mpich/lib/cmake/fftw3/*.cmake
>+%endif
>+%if %{long}
>+%dir %{_libdir}/mpich/lib/cmake/fftw3l/
>+%{_libdir}/mpich/lib/cmake/fftw3l/*.cmake
>+%endif
>+%if %{quad}
>+%dir %{_libdir}/mpich/lib/cmake/fftw3q/
>+%{_libdir}/mpich/lib/cmake/fftw3q/*.cmake
>+%endif
>+
> %{_libdir}/mpich/lib/pkgconfig/fftw3*.pc
> %{_libdir}/mpich/lib/libfftw3*.so
>
>@@ -515,20 +685,24 @@ done
> %if %{with openmpi}
> %files openmpi-libs
>
>+%if %{single}
> %files openmpi-libs-single
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/openmpi/lib/libfftw3f_mpi.so.*
>-
>+%endif
>+%if %{double}
> %files openmpi-libs-double
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/openmpi/lib/libfftw3_mpi.so.*
>-
>+%endif
>+%if %{long}
> %files openmpi-libs-long
> %license COPYING COPYRIGHT
> %doc AUTHORS ChangeLog NEWS README* TODO
> %{_libdir}/openmpi/lib/libfftw3l_mpi.so.*
>+%endif
>
> %files openmpi-devel
> %doc doc/FAQ/fftw-faq.html/
>--
>2.31.1
>

Actions: View | Diff

Attachments on bug 1729652: 1683641 | 1779444 | 1779474