diff --git a/libs/libfftw/libfftw-3.3.8-20200429.diff b/libs/libfftw/libfftw-3.3.8-20200429.diff new file mode 100644 index 00000000..b535a8f4 --- /dev/null +++ b/libs/libfftw/libfftw-3.3.8-20200429.diff @@ -0,0 +1,16 @@ +diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' -x CMakeLists.txt.user fftw-3.3.8.orig/CMakeLists.txt fftw-3.3.8/CMakeLists.txt +--- fftw-3.3.8.orig/CMakeLists.txt 2018-05-24 14:03:22.000000000 +0200 ++++ fftw-3.3.8/CMakeLists.txt 2020-04-29 10:07:36.000000000 +0200 +@@ -412,6 +412,12 @@ + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT Development) + ++install (FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/fftw${PREC_SUFFIX}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++ RENAME fftw${PREC_SUFFIX}3.pc ++ COMPONENT Development) ++ + # cmake file + set (FFTW3_LIBRARIES "FFTW3::${fftw3_lib}") + configure_file (FFTW3Config.cmake.in FFTW3${PREC_SUFFIX}Config.cmake @ONLY) diff --git a/libs/libfftw/libfftw.py b/libs/libfftw/libfftw.py index 3b3e4a3b..27815db7 100644 --- a/libs/libfftw/libfftw.py +++ b/libs/libfftw/libfftw.py @@ -1,33 +1,36 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def setTargets(self): self.targets['3.3.8'] = 'http://www.fftw.org/fftw-3.3.8.tar.gz' + self.patchToApply["3.3.8"] = [("libfftw-3.3.8-20200429.diff", 1)] if CraftCore.compiler.isWindows: - self.patchToApply['3.3.8'] = ('libfftw-win32-aligned-malloc.patch', 0) + self.patchToApply['3.3.8'].append(('libfftw-win32-aligned-malloc.patch', 0)) self.targetDigests['3.3.8'] = '59831bd4b2705381ee395e54aa6e0069b10c3626' self.targetInstSrc['3.3.8'] = "fftw-3.3.8" + self.patchLevel['3.3.8'] = 1 self.description = "a C subroutine library for computing the discrete Fourier transform (DFT)" self.defaultTarget = '3.3.8' def setDependencies(self): self.buildDependencies["virtual/base"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) self.supportsNinja = False self.subinfo.options.configure.args += \ ' -DENABLE_SSE2=ON -DENABLE_AVX=OFF ' \ ' -DENABLE_THREADS=ON -DWITH_COMBINED_THREADS=ON ' if CraftCore.compiler.isWindows: self.subinfo.options.configure.args += \ ' -DWITH_OUR_MALLOC=ON -DFFTW_ENABLE_ALLOCA=OFF ' \ ' -DWINDOWS_F77_MANGLING=ON ' +