diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-24 08:40:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-24 08:42:38 +0000 |
| commit | 6a9e00ad955d9bf2c5fdf0028e911b862edd4b40 (patch) | |
| tree | 872f1ecbd59874d635e4e5580760de539a48383d /main | |
| parent | 60f4944924ede17cb711ccd7efab7da50f36bd72 (diff) | |
| download | aports-6a9e00ad955d9bf2c5fdf0028e911b862edd4b40.tar.bz2 aports-6a9e00ad955d9bf2c5fdf0028e911b862edd4b40.tar.xz | |
main/qemu: fix configure ifunc check
compiler and linker supports ifunc but musl dynamic linker does not.
fixes #5768
Diffstat (limited to 'main')
| -rw-r--r-- | main/qemu/APKBUILD | 6 | ||||
| -rw-r--r-- | main/qemu/configure-ifunc.patch | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 97a333c1b1..6754b6fdbf 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu pkgver=2.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://qemu.org/" arch="all" @@ -122,6 +122,7 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch musl-F_SHLCK-and-F_EXLCK.patch fix-sigevent-and-sigval_t.patch + configure-ifunc.patch $pkgname-guest-agent.confd $pkgname-guest-agent.initd 80-kvm.rules @@ -277,6 +278,7 @@ md5sums="ca3f70b43f093e33e9e014f144067f13 qemu-2.6.0.tar.bz2 d364208c4847ad2baeb237900befecd1 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch bc5f2e41ed3b6d6d30b672adab82e3e1 musl-F_SHLCK-and-F_EXLCK.patch 9afbd6c9586229ce64275f012d665e2a fix-sigevent-and-sigval_t.patch +cf2692a166a417d021f0966f9421ede2 configure-ifunc.patch 1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd ea972f2fc5505488f68320bf386106bb qemu-guest-agent.initd 66660f143235201249dc0648b39b86ee 80-kvm.rules" @@ -285,6 +287,7 @@ af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-l 6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch eefd597197223899d3b12d8274af493153e270fd06ea8622e33d6eaeae063d40 musl-F_SHLCK-and-F_EXLCK.patch 9abdf3410dea742cac3552363950c8a7fbcec8dd2bfd68e3c417a284f4e702f5 fix-sigevent-and-sigval_t.patch +96b7fa37c89d9345328cd60bba3612877c149d2fd06b7de169e71ed9fa2aec33 configure-ifunc.patch d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd 5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5 qemu-guest-agent.initd 37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules" @@ -293,6 +296,7 @@ sha512sums="0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422 ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 5de10f7e8abae16d1d7521e5ca1bfb62a8f295b324bea84f122f882b7b9354c21e5a00b20a1c5484c1b737b937e53c4ca6979e55705522f0779a5669725369f5 musl-F_SHLCK-and-F_EXLCK.patch e3f006c28318669356cd5b778f26774f06b0a40a4ac852573379df63efcc8276869958faec16797a38bf96c6061dfc040309e462d8559984f67eaf4af701ca1a fix-sigevent-and-sigval_t.patch +0f887d4b56d8369801bb6b890f75f544eed32fd43b3086337c79b0d1a0c0ca8e25e0ea5e288f6a1891e817d37e1dba72ed5d6a0bc69016c65e6365ee49478999 configure-ifunc.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd 316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7 qemu-guest-agent.initd 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules" diff --git a/main/qemu/configure-ifunc.patch b/main/qemu/configure-ifunc.patch new file mode 100644 index 0000000000..c047882ff4 --- /dev/null +++ b/main/qemu/configure-ifunc.patch @@ -0,0 +1,14 @@ +compiler supports ifunc but musl dynamic linker does not. + +--- ./configure.orig ++++ ./configure +@@ -1787,7 +1787,8 @@ + int main(void) { foo(); return 0; } + EOF + if compile_prog "-mavx2" "" ; then +- if readelf --syms $TMPE |grep "IFUNC.*foo" >/dev/null 2>&1; then ++ if readelf --syms $TMPE |grep "IFUNC.*foo" >/dev/null 2>&1 && ++ ldd $TMPE >/dev/null 2>&1; then + avx2_opt="yes" + fi + fi |