3.3.6-1: Upstream update

2 files changed, 16 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56e5d999e9fb..2f323f5e1726 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Aug  6 13:08:25 UTC 2016
+# Mon Jan 23 16:20:55 UTC 2017
 pkgbase = lib32-fftw
 	pkgdesc = A library for computing the discrete Fourier transform (DFT) (32 bit)
-	pkgver = 3.3.5
+	pkgver = 3.3.6
 	pkgrel = 1
 	url = http://www.fftw.org/
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = lib32-fftw
 	depends = lib32-glibc
 	depends = fftw
 	options = !libtool
-	source = http://www.fftw.org/fftw-3.3.5.tar.gz
-	md5sums = 6cc08a3b9c7ee06fdd5b9eb02e06f569
+	source = http://www.fftw.org/fftw-3.3.6-pl1.tar.gz
+	md5sums = 682a0e78d6966ca37c7446d4ab4cc2a1
 
 pkgname = lib32-fftw
 
diff --git a/PKGBUILD b/PKGBUILD
index b38d17248830..60c7a4a977b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=fftw
 pkgname=lib32-${_pkgname}
-pkgver=3.3.5
+pkgver=3.3.6
 pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT) (32 bit)"
 arch=('x86_64')
@@ -12,8 +12,8 @@ url="http://www.fftw.org/"
 depends=('lib32-glibc' "${_pkgname}")
 makedepends=('gcc-fortran-multilib')
 options=('!libtool')
-source=("http://www.fftw.org/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('6cc08a3b9c7ee06fdd5b9eb02e06f569')
+source=("http://www.fftw.org/${_pkgname}-${pkgver}-pl1.tar.gz")
+md5sums=('682a0e78d6966ca37c7446d4ab4cc2a1')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
@@ -22,13 +22,14 @@ md5sums=('6cc08a3b9c7ee06fdd5b9eb02e06f569')
 
 
 build() {
+cd ${srcdir}
 export CC='gcc -m32'
 export CXX='g++ -m32'
 export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
   
-cp -af ${_pkgname}-${pkgver} ${_pkgname}-${pkgver}-double
-cp -af ${_pkgname}-${pkgver} ${_pkgname}-${pkgver}-long-double
-mv -f ${_pkgname}-${pkgver} ${_pkgname}-${pkgver}-single
+cp -a ${_pkgname}-${pkgver}-pl1 ${_pkgname}-${pkgver}-double
+cp -a ${_pkgname}-${pkgver}-pl1 ${_pkgname}-${pkgver}-long-double
+mv ${_pkgname}-${pkgver}-pl1 ${_pkgname}-${pkgver}-single
 
 # use upstream default CFLAGS while keeping our -march/-mtune
 CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math"
@@ -38,23 +39,25 @@ CONFIGURE="./configure F77=gfortran --prefix=/usr \
 	--enable-openmp \
 	--libdir=/usr/lib32"
 
-msg "build double precision"
+# build double precision
 cd ${srcdir}/${_pkgname}-${pkgver}-double
 $CONFIGURE --enable-sse2 --enable-avx
 make
 
-msg "build long double precision"
+# build and install long double precision
 cd ${srcdir}/${_pkgname}-${pkgver}-long-double
 $CONFIGURE --enable-long-double
 make
 
-msg "build single precision"
+# build and install single precision
 cd ${srcdir}/${_pkgname}-${pkgver}-single
 $CONFIGURE --enable-float --enable-sse --enable-avx
 make
 }
 
 package() {
+cd ${srcdir}
+
 cd ${srcdir}/${_pkgname}-${pkgver}-double
 make DESTDIR="${pkgdir}" install