Merge pull request JuliaLang#8204 from JuliaLang/vs/fftw

Bump FFTW to 3.3.4
gloine · Sep 3, 2014 · 49d4132 · 49d4132
2 parents eb65543 + 190b49f
commit 49d4132
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 33 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -1126,10 +1126,6 @@ fftw-$(FFTW_VER)-single/configure: fftw-$(FFTW_VER).tar.gz
 	$(JLCHECKSUM) $<
 	mkdir -p fftw-$(FFTW_VER)-single && \
 	$(TAR) -C fftw-$(FFTW_VER)-single --strip-components 1 -xf $<
-ifeq ($(OS),WINNT)
-	patch fftw-$(FFTW_VER)-single/configure < fftw-config-nopthreads.patch
-	patch fftw-$(FFTW_VER)-single/kernel/ifftw.h < ifftw.h.patch
-endif
 	touch -c $@
 fftw-$(FFTW_VER)-single/config.status: fftw-$(FFTW_VER)-single/configure
 	cd fftw-$(FFTW_VER)-single && \
@@ -1164,10 +1160,6 @@ fftw-$(FFTW_VER)-double/configure: fftw-$(FFTW_VER).tar.gz
 	$(JLCHECKSUM) $<
 	mkdir -p fftw-$(FFTW_VER)-double && \
 	$(TAR) -C fftw-$(FFTW_VER)-double --strip-components 1 -xf $<
-ifeq ($(OS),WINNT)
-	patch fftw-$(FFTW_VER)-double/configure < fftw-config-nopthreads.patch
-	patch fftw-$(FFTW_VER)-double/kernel/ifftw.h < ifftw.h.patch
-endif
 	touch -c $@
 fftw-$(FFTW_VER)-double/config.status: fftw-$(FFTW_VER)-double/configure
 	cd fftw-$(FFTW_VER)-double && \

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -6,7 +6,7 @@ DSFMT_VER = 2.2
 OPENBLAS_VER = v0.2.10
 LAPACK_VER = 3.5.0
 ARPACK_VER = 3.1.5
-FFTW_VER = 3.3.3
+FFTW_VER = 3.3.4
 SUITESPARSE_VER = 4.2.1
 UNWIND_VER = 1.1
 OSXUNWIND_VER = 0.0.1-rc3

diff --git a/deps/checksums/fftw-3.3.3.tar.gz/md5 b/deps/checksums/fftw-3.3.3.tar.gz/md5
diff --git a/deps/checksums/fftw-3.3.3.tar.gz/sha512 b/deps/checksums/fftw-3.3.3.tar.gz/sha512
diff --git a/deps/checksums/fftw-3.3.4.tar.gz/md5 b/deps/checksums/fftw-3.3.4.tar.gz/md5
@@ -0,0 +1 @@
+2edab8c06b24feeb3b82bbb3ebf3e7b3
diff --git a/deps/checksums/fftw-3.3.4.tar.gz/sha512 b/deps/checksums/fftw-3.3.4.tar.gz/sha512
@@ -0,0 +1 @@
+1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1
diff --git a/deps/fftw-config-nopthreads.patch b/deps/fftw-config-nopthreads.patch
diff --git a/deps/ifftw.h.patch b/deps/ifftw.h.patch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1