diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-07-11 01:58:02 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-07-11 01:58:02 +0000 |
| commit | f8065aaca36493f89702ae38b2ba0077c4adc751 (patch) | |
| tree | be821418909647f80a60678de0e53fc973bf6daf /app-emulation | |
| parent | Make USE=snmp fatal when net-snmp is not installed, and make an unreadable /p... (diff) | |
| download | historical-f8065aaca36493f89702ae38b2ba0077c4adc751.tar.gz historical-f8065aaca36493f89702ae38b2ba0077c4adc751.tar.bz2 historical-f8065aaca36493f89702ae38b2ba0077c4adc751.zip | |
Attempt to better handle the case when we can't have PIE enabled, which is when GCC was built with USE=nopie or when USE=static is enabled. bug #425662
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 3cc12410f732..9cf166976d91 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.133 2012/07/10 23:46:39 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.134 2012/07/11 01:58:02 cardoe Exp $ + + 10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.0.ebuild: + Attempt to better handle the case when we can't have PIE enabled, which is + when GCC was built with USE=nopie or when USE=static is enabled. bug #425662 10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.0.ebuild: Fix 'virtfs' USE flag to correctly depend on sys-libs/libcap and not depend diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 6584de575b0a..9146ac1ce0f9 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -21,7 +21,7 @@ EBUILD qemu-kvm-0.15.1-r1.ebuild 9554 SHA256 5df35e4282ad6e801d76ee77c10d93388e3 EBUILD qemu-kvm-1.0-r3.ebuild 11641 SHA256 b9834fb044c515f8c0bfa2aa3770f2ce9de842079436259e5857d1e8379c08c7 SHA512 b16d3d7dd2d6f90fcc19831b600691460b6eb6e8a3d8ba5ddfc5fdd0018b90c888837e8bacc2d8a928df6e24dd486e0c1f3b68e207835cb3ab1597d89f3e91e6 WHIRLPOOL 3770928f0afb39ae9fc6a0aaf86f0e892d7be84292407e358df02d59fd37ddb71e5c82c8e217ceba33bc7054e706a4856fd58cf3e1f90eb34e72d12d013daa21 EBUILD qemu-kvm-1.0.1-r1.ebuild 12205 SHA256 2d0937b952b3ef20d9e906341abed691199b2a0cd97ea945e4fde9d4f1889843 SHA512 d1b3ade271a5c8ca3f6dd5e01bd5e1487faefd1657d41cde8b1427d13c1792f3794815d6b4f9b1c044f97dcde28ac9998d56b767fbb39471c17621a454d29a10 WHIRLPOOL 49cc3c97cfdaac12ffd48212a99aaeb9b27af871381d2d5d602c186d1498164d7c2058a75e1590331f99368e6618c959396d16ed9feaebf0d4d1ac1a07108d3e EBUILD qemu-kvm-1.0.1.ebuild 11479 SHA256 6da24cfe70e532037576f6893e894686e9af15dd517bfcdb28e2dbc921a3832b SHA512 7b20463967947dc5398c45a5c9cdafb4a489f7acbf921c537f0b7286e07fa687f6f19e47713161c52cc43a9d4d003e706cee5aef2f0ece8bc6a768082cb15390 WHIRLPOOL 3d845dab92364b97545f996adbf7af1b64abd5e1c90c1aacd0d35dab038ea3d024ea086b14a26352f72df1dc290c750f3087a100a5405ddc7bd0f2888f1c58c6 -EBUILD qemu-kvm-1.1.0.ebuild 11513 SHA256 5db214dba9ab4f89c9fd27d9739d506fc0d9536340a1543a3b95ca35abc7035f SHA512 5d7b898f8cface9c38883d0637ae619842861347d08eecfaf61da1372b5ac1fdcc1d8ac0c1102b273036b0f6022f8195d4c04a82f88ef01b5f96541b61c3eb25 WHIRLPOOL 46ec77a5a40ad6f15cfdd8aff48279bb13f1bfd861a46909926aab96408a6a977a683716df265a5c9af6ccac81e85bac080c16ef80a60a591478279b58dc7fd7 +EBUILD qemu-kvm-1.1.0.ebuild 11775 SHA256 bfb2d973e6357d11c2806c5a859fb842afdf6742dba38c4f36d43a8dd9ce2ec6 SHA512 028ed922a80a9005e1cd77a7356778845778f15f6b62876e983527f8ea46afdfbf67019168182043d41e3959c7c7ccb1065f2938a2dc422bc2b34f4a3b7274d6 WHIRLPOOL 2c8c9654799224bdf030adc3f8c3f106cf1a9e78f9034c4708ed151d16b8007b5474cf45718e67d635024c319fb6c6310c77949bd7b390d9a57438ac636f9b77 EBUILD qemu-kvm-9999.ebuild 11399 SHA256 702a9b247a1ee72b5983e7aea343e491e63882832f0a4ba39659555585494096 SHA512 b114b0675325a58ff7179abc83e6e70dd4f8efe33082299e561a6a7fa9c05fed6724b1ffc6c734ca42293ca25f7693b7a045ece2c993fe0777242f278413d545 WHIRLPOOL f4b80310109ae355506a5868d606deb0467f0ffbae840a86d49031f31ab80dc358797b2bb8b6caec156683e226a2d9be70df21d4673025a419f32a4497d832cb -MISC ChangeLog 26529 SHA256 5a25828d81317af877fee02a6403362860ab3345afccff2d0de7cb22fa92cb7e SHA512 2abfeeafe2508f38aecd9ccdca63b72767aeafe78c8bf720c4abd88ed11232490835498aa537491dcb5dad05fa1c16797fc640bab3ea0f37c998c207bee29a77 WHIRLPOOL a9063cd38300961a8f6e3de5aa69ac0b3c39c5112af3f3815a8cd77a555badc90a711a4b72f577f8703978be1e790e80bdc41d24d9090ec6db90754efabe6fab +MISC ChangeLog 26759 SHA256 cdd289803ccdf77bee1c63b331293232719fd5c3e4de3d2da104537c0406cd8b SHA512 c9456d8e9633095ee59d7485a26759b996b2f217974a58bd13032fcb17f7f569a9fd7079c0814d6eda101627cf399032bd24569d0cc230d43037b0d47c8f2d5b WHIRLPOOL 6589237f7e5d45cd103aabcaf1d59194693a4b1e253f4de0e6dc33d6843f0025889e13bbc8b48cc7b463f58942e792d00e31b86c0505b7d90e2bce3c5850c427 MISC metadata.xml 2416 SHA256 1613b0e695f6cdd5c21b0b6e5f470adc250b261a8a40bfb3c7f246d3f590acf9 SHA512 e6906e146aded4f9e182fc8da99a578800b91287f5d5446c53d08ae764304c2ca02002098f61032f547873f808554cac2d4b29115ce0dcea36df41e9e6667ec8 WHIRLPOOL da9ff6660bb89b3b4077bfb52f18098eb7392ac0e1af05028950c9843c03be6f6a0765ec9577e6a0d8f36fd6b130828c52f31a0d020034531a944dca516009e3 diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild index 4b1ed55d4d3d..74963f839cb0 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.11 2012/07/10 23:46:39 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.12 2012/07/11 01:58:02 cardoe Exp $ EAPI="4" @@ -221,7 +221,14 @@ src_configure() { conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" # Add support for static builds - use static && conf_opts="${conf_opts} --static" + use static && conf_opts="${conf_opts} --static --disable-pie" + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if ! use static && gcc-specs-pie; then + conf_opts="${conf_opts} --enable-pie" + fi # audio options audio_opts="oss" @@ -241,7 +248,6 @@ src_configure() { --disable-strip \ --disable-werror \ --enable-guest-agent \ - --enable-pie \ --enable-vnc-jpeg \ --enable-vnc-png \ --enable-vnc-thread \ |