diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/fftw/APKBUILD | 15 | ||||
| -rw-r--r-- | user/fftw/cycle.h.patch | 29 |
2 files changed, 6 insertions, 38 deletions
diff --git a/user/fftw/APKBUILD b/user/fftw/APKBUILD index 881ed5d64..31a334f88 100644 --- a/user/fftw/APKBUILD +++ b/user/fftw/APKBUILD @@ -1,9 +1,9 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> +# Maintainer: pkgname=fftw -pkgver=3.3.6p2 -pkgrel=2 -pkgdesc="fastest fourier transform in the west" +pkgver=3.3.8 +pkgrel=0 +pkgdesc="Fastest fourier transform in the west" url="http://www.fftw.org/" # s390x: hangs on container and KVM arch="all !s390x" @@ -13,8 +13,7 @@ makedepends="texinfo" subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single $pkgname-long-double-libs:long_double $pkgname-double-libs:double" srcpkgver=${pkgver//p/-pl} -source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz - cycle.h.patch" +source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz" builddir="$srcdir/$pkgname-$srcpkgver" _precision="single double long-double" @@ -22,7 +21,6 @@ _precision="single double long-double" prepare() { default_prepare - cd "$builddir" local i; for i in $_precision; do cp -r "$builddir" $srcdir/$i done @@ -94,5 +92,4 @@ long_double() { "$subpkgdir"/usr/lib/ } -sha512sums="e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472 fftw-3.3.6-pl2.tar.gz -d71ffb0aa658f7b22239491698426f4a97e657abc953020745f7581d2937a062a279eaa5980cd7f7fe2e8425a032eafc3d4c0cffdc79a83a3aef382c988d739a cycle.h.patch" +sha512sums="ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38 fftw-3.3.8.tar.gz" diff --git a/user/fftw/cycle.h.patch b/user/fftw/cycle.h.patch deleted file mode 100644 index ff70cdb4d..000000000 --- a/user/fftw/cycle.h.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./kernel/cycle.h.orig -+++ ./kernel/cycle.h -@@ -437,26 +437,6 @@ - #define HAVE_TICK_COUNTER - #endif - /*----------------------------------------------------------------*/ --/* SGI/Irix */ --#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER) --typedef struct timespec ticks; -- --static inline ticks getticks(void) --{ -- struct timespec t; -- clock_gettime(CLOCK_SGI_CYCLE, &t); -- return t; --} -- --static inline double elapsed(ticks t1, ticks t0) --{ -- return ((double)t1.tv_sec - (double)t0.tv_sec) * 1.0E9 + -- ((double)t1.tv_nsec - (double)t0.tv_nsec); --} --#define HAVE_TICK_COUNTER --#endif -- --/*----------------------------------------------------------------*/ - /* Cray UNICOS _rtc() intrinsic function */ - #if defined(HAVE__RTC) && !defined(HAVE_TICK_COUNTER) - #ifdef HAVE_INTRINSICS_H |