diff options
| author | Isaac Dunham <ibid.ag@gmail.com> | 2014-10-23 10:03:56 -0700 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-23 18:04:38 +0000 |
| commit | 65481c14000145a3737faa267d1a43f82b052615 (patch) | |
| tree | 467721edb4b87133eb1ac2f6381e7e0ac7794e3b /testing/openblas | |
| parent | ec60f859c92218020657cc3c877b07fb36b46d27 (diff) | |
| download | aports-65481c14000145a3737faa267d1a43f82b052615.tar.bz2 aports-65481c14000145a3737faa267d1a43f82b052615.tar.xz | |
testing/openblas: update to 0.2.12
Diffstat (limited to 'testing/openblas')
| -rw-r--r-- | testing/openblas/00-cpuid.patch | 34 | ||||
| -rw-r--r-- | testing/openblas/APKBUILD | 16 |
2 files changed, 6 insertions, 44 deletions
diff --git a/testing/openblas/00-cpuid.patch b/testing/openblas/00-cpuid.patch deleted file mode 100644 index 7758b4691a..0000000000 --- a/testing/openblas/00-cpuid.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit db7e6366cd86b57cd0712293968938058288bde0 -Author: Isaac Dunham <ibid.ag@gmail.com> -Date: Thu Aug 28 13:05:07 2014 -0700 - - Workaround PIC limitations in cpuid. - - cpuid uses register ebx, but ebx is reserved in PIC. - So save ebx, swap ebx & edi, and return edi. - - Copied from Igor Pavlov's equivalent fix for 7zip (in CpuArch.c), - which is public domain and thus OK license-wise. - -diff --git a/cpuid_x86.c b/cpuid_x86.c -index 53016e1..f9df722 100644 ---- a/cpuid_x86.c -+++ b/cpuid_x86.c -@@ -59,9 +59,16 @@ - void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx); - #else - static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx){ -+#if defined(__i386__) && defined(__PIC__) -+ __asm__ __volatile__ -+ ("mov %%ebx, %%edi;" -+ "cpuid;" -+ "xchgl %%ebx, %%edi;" -+ : "=a" (*eax), "=D" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc"); -+#else - __asm__ __volatile__ - ("cpuid": "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc"); -- -+#endif - } - #endif - diff --git a/testing/openblas/APKBUILD b/testing/openblas/APKBUILD index 27188667a0..f7d45a0bcc 100644 --- a/testing/openblas/APKBUILD +++ b/testing/openblas/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Isaac Dunham <ibid.ag@gmail.com> # Maintainer: Isaac Dunham <ibid.ag@gmail.com> pkgname=openblas -pkgver=0.2.11 -pkgrel=1 +pkgver=0.2.12 +pkgrel=0 pkgdesc="A fast BSD-licensed BLAS based on gotoBLAS2, with LAPACK" url="http://www.openblas.net" arch="all" @@ -12,8 +12,7 @@ depends_dev="gfortran" makedepends="$depends_dev perl" install="" subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::http://github.com/xianyi/OpenBLAS/archive/v$pkgver.tar.gz - 00-cpuid.patch" +source="$pkgname-$pkgver.tar.gz::http://github.com/xianyi/OpenBLAS/archive/v$pkgver.tar.gz" _builddir="$srcdir"/OpenBLAS-$pkgver prepare() { @@ -45,9 +44,6 @@ package() { install -m 0644 $FILE "$pkgdir/usr/share/doc/$pkgname" || return 1 done } -md5sums="c456f3c5e84c3ab69ef89b22e616627a openblas-0.2.11.tar.gz -0b8b59052a6387fe4aa9e3e473b3749b 00-cpuid.patch" -sha256sums="dc06836e700ef26519933af309a25958150693c376a536fe35d633d76f1a5606 openblas-0.2.11.tar.gz -65a809e9f0f06fd9ccefd0af6bc7c398fefe011404f699926946320783050d8b 00-cpuid.patch" -sha512sums="68abdf8366d4766fe5d852ca3850ea6236d4dc5bad044fa4116ca60872716003746bcfdb1005aac87533d9a085ae319ef18b7ed6f293baf88c79fd7c8562c9f0 openblas-0.2.11.tar.gz -1f41a324a9f233ef5fe037cd16c4aeabaf5895ba42e2f3758f8bb7a2cddda967fc01df50d86218f316d9406bb6ced4e91d4aec8119fc8f9c2f11b4ecf24e551f 00-cpuid.patch" +md5sums="5df7f175b2db6a2b02ca4ff932e39bc7 openblas-0.2.12.tar.gz" +sha256sums="b41f71f46faab1215f6f6d17541113dc01fd4d8fee0694f3f459bc2e3c2aaaaf openblas-0.2.12.tar.gz" +sha512sums="3de9733e47fccdb1f8acbadd3418fd05c5c07e2a06552467ceb42c9ff4f9bd12243fa9027bca441299cf5f97c5e56774eab0a6d4ee1dca333fb4c85af69b7dc4 openblas-0.2.12.tar.gz" |