From 49be32d763b8700b55f8246eebf68fea4857c175 Mon Sep 17 00:00:00 2001 From: wenyuzifangtest001 Date: Tue, 16 Sep 2025 23:42:55 +0800 Subject: [PATCH] Update code from upstream --- fftw.spec | 9 ++++++--- fix_autotools_build.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 fix_autotools_build.patch diff --git a/fftw.spec b/fftw.spec index 8e6e023..697d349 100644 --- a/fftw.spec +++ b/fftw.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 %ifarch x86_64 %bcond_without quad @@ -15,14 +15,15 @@ %endif Name: fftw -Version: 3.3.10 +Version: 3.3.10 Release: %{anolis_release}%{?dist} Summary: A Fast Fourier Transform library License: GPLv2+ URL: http://www.fftw.org -Source0: http://www.fftw.org/fftw-%{version}.tar.gz +Source0: http://www.fftw.org/fftw-3.3.10.tar.gz Patch1001: 1001-skip-mpi-check.patch +Patch1002: fix_autotools_build.patch BuildRequires: make gcc-gfortran BuildRequires: time perl-interpreter @@ -478,6 +479,8 @@ done %endif %changelog +* Tue Sep 16 2025 wenyuzifangtest001 - 3.3.10-4 +- Simplify configuration by removing outdated include, improving reliability and reducing maintenance burden. * Wed Aug 16 2023 Wenlong Zhang - 3.3.10-3 - update config.sub and config.guess for loongarch64 diff --git a/fix_autotools_build.patch b/fix_autotools_build.patch new file mode 100644 index 0000000..7bc7696 --- /dev/null +++ b/fix_autotools_build.patch @@ -0,0 +1,13 @@ +diff --git a/FFTW3Config.cmake.in b/FFTW3Config.cmake.in +index 6b1fbc2..e8a2ed8 100644 +--- a/FFTW3Config.cmake.in ++++ b/FFTW3Config.cmake.in +@@ -10,8 +10,6 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@) + set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@) + set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@) + +-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake") +- + if (CMAKE_VERSION VERSION_LESS 2.8.3) + set (CMAKE_CURRENT_LIST_DIR) + endif () -- Gitee