Merge pull request #3846 from Wedmer/master

[libs/fftw3] Updated to version 3.3.6

libs/fftw3/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fftw3
-PKG_VERSION:=3.3.4
+PKG_VERSION:=3.3.6
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0+
 
 PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.fftw.org
-PKG_MD5SUM:=2edab8c06b24feeb3b82bbb3ebf3e7b3
+PKG_MD5SUM:=ccd91b5b12bd0a441e100070ff09a310
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/fftw-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf

libs/fftw3/patches/001-makefile.patch

@@ -1,19 +1,19 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -232,7 +232,7 @@ 
+@@ -241,7 +241,7 @@
  CTAGS = ctags
  CSCOPE = cscope
  DIST_SUBDIRS = support genfft kernel simd-support dft rdft reodft api \
 -	libbench2 . threads tests mpi doc tools m4
 +	libbench2 . threads mpi doc tools m4
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -444,7 +444,7 @@
- #
- @COMBINED_THREADS_TRUE@CHICKEN_EGG = threads .
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(srcdir)/fftw.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+ 	README TODO compile config.guess config.sub install-sh \
+@@ -470,7 +470,7 @@
+ # tools are available, such as fig2dev in maintainer mode)
+ @BUILD_DOC_TRUE@DOCDIR = doc
  SUBDIRS = support $(GENFFT) kernel simd-support dft rdft reodft api	\
--libbench2 $(CHICKEN_EGG) tests mpi doc tools m4
+-libbench2 $(CHICKEN_EGG) tests mpi $(DOCDIR) tools m4
 +libbench2 $(CHICKEN_EGG) mpi m4
  
  EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in