diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-20 08:19:58 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-20 08:37:02 +0000 |
| commit | d2b0a4bbd4156d634798479821cbd047f47c8da2 (patch) | |
| tree | d4e098c1c2f4620d1cc1bdd25905b0aec2e9f2da | |
| parent | 1f645d9298da5453d793ffc715581420270469e7 (diff) | |
| download | aports-d2b0a4bbd4156d634798479821cbd047f47c8da2.tar.bz2 aports-d2b0a4bbd4156d634798479821cbd047f47c8da2.tar.xz | |
main/liboil: fix stack overflow on s390x stamp
| -rw-r--r-- | main/liboil/APKBUILD | 8 | ||||
| -rw-r--r-- | main/liboil/fix-s390x-stamp.patch | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/main/liboil/APKBUILD b/main/liboil/APKBUILD index 9ff2cfba29..40db892144 100644 --- a/main/liboil/APKBUILD +++ b/main/liboil/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=liboil pkgver=0.3.17 -pkgrel=6 +pkgrel=7 pkgdesc="Library of simple functions that are optimized for various CPUs." url="https://liboil.freedesktop.org/" arch="all" license="BSD-2-Clause-NetBSD, BSD-3-Clause, Weird-Motorola-License" # FIXME subpackages="$pkgname-dev $pkgname-doc" depends= -source="http://$pkgname.freedesktop.org/download/$pkgname-$pkgver.tar.gz" +source="http://$pkgname.freedesktop.org/download/$pkgname-$pkgver.tar.gz + fix-s390x-stamp.patch" prepare() { cd "$builddir" @@ -37,4 +38,5 @@ package() { install -m755 -d "$pkgdir"/usr/share/licenses/liboil install -m644 COPYING "$pkgdir"/usr/share/licenses/liboil/ } -sha512sums="26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145 liboil-0.3.17.tar.gz" +sha512sums="26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145 liboil-0.3.17.tar.gz +58bd22f90062bd87765734650bffa292e50b1a6744a74665a59f61ceaa8d0a668d48fe73b84fcaa0371dfa299a5715bd91e4f4699b1db8cb16ea09953b2bf45c fix-s390x-stamp.patch" diff --git a/main/liboil/fix-s390x-stamp.patch b/main/liboil/fix-s390x-stamp.patch new file mode 100644 index 0000000000..49536afcff --- /dev/null +++ b/main/liboil/fix-s390x-stamp.patch @@ -0,0 +1,13 @@ +diff --git a/liboil/liboilcpu-misc.c b/liboil/liboilcpu-misc.c +index 97b740c..9333b13 100644 +--- a/liboil/liboilcpu-misc.c ++++ b/liboil/liboilcpu-misc.c +@@ -87,7 +87,7 @@ static unsigned long + oil_profile_stamp_s390(void) + { + uint64_t ts; +- __asm__ __volatile__ ("STCK %0(%0)\n" : : "r" (&ts)); ++ __asm__ __volatile__ ("STCK %0\n" : "=Q" (ts) :: "cc"); + return ts; + } + |