diff options
| -rw-r--r-- | main/qemu/APKBUILD | 14 | ||||
| -rw-r--r-- | main/qemu/configure-ifunc.patch | 19 |
2 files changed, 15 insertions, 18 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 11e3dc193b..85d37f7261 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=2.6.2 +pkgver=2.7.0 pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://qemu.org/" @@ -280,32 +280,32 @@ guest() { "$subpkgdir"/etc/conf.d/$pkgname-guest-agent || return 1 } -md5sums="bdf1f3d0c177ebeb35a079a4bc3fc74e qemu-2.6.2.tar.bz2 +md5sums="08d4d06d1cb598efecd796137f4844ab qemu-2.7.0.tar.bz2 672727bb1d8c8ab7b5def65dd1793c33 0001-elfload-load-PIE-executables-to-right-address.patch 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 +a3ec1de5e0513c97a83d211f182a634c configure-ifunc.patch 1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd ea972f2fc5505488f68320bf386106bb qemu-guest-agent.initd 66660f143235201249dc0648b39b86ee 80-kvm.rules a2f5570453f2489b6e4023e96f70cb7e bridge.conf" -sha256sums="9a7ec64f147b9e1e570c410e00ebe271869b5d4c85392ba047db7617c297faa3 qemu-2.6.2.tar.bz2 +sha256sums="326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2 af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-load-PIE-executables-to-right-address.patch 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 +73a87efa545ee16b8bef9ddea870da29f0eed71a8a6934d2888577b03088286b configure-ifunc.patch d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd 5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5 qemu-guest-agent.initd 37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules 2f05021990014a5f832aa17317c1464806dc97c278f88d8284db88378f53cb32 bridge.conf" -sha512sums="7a68b4bf7a3d04a1c4402b09e0b81e37d2431b5dd8a10b07d0e11b28bdf92e6e19800859feee50d54c62dae58bbd85dfd208e9cab4eb0310b4749e6911fcc49f qemu-2.6.2.tar.bz2 +sha512sums="654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db qemu-2.7.0.tar.bz2 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch 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 +f51a2906b8685c007c6dbba9ecfe1cc3a34cad4fe1264a2d02e1add05a391d95bfe05524adf58d1a880d39a2b23bcce6a850265b82c49f64171019bdf38978de 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 index c047882ff4..3d455a9628 100644 --- a/main/qemu/configure-ifunc.patch +++ b/main/qemu/configure-ifunc.patch @@ -1,14 +1,11 @@ -compiler supports ifunc but musl dynamic linker does not. - --- ./configure.orig +++ ./configure -@@ -1787,7 +1787,8 @@ - int main(void) { foo(); return 0; } +@@ -1805,7 +1805,7 @@ 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 + if compile_object "" ; then + if has readelf; then +- if readelf --syms $TMPO 2>/dev/null |grep -q "IFUNC.*foo"; then ++ if readelf --syms $TMPO 2>/dev/null |grep -q "IFUNC.*foo" && ldd $TMPO >/dev/null 2>&1; then + avx2_opt="yes" + fi + fi |