summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-12-10 15:01:02 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-12-10 15:03:03 +0000
commit3ef9e5361d90e4a3b60da326db292bdd13322529 (patch)
tree9da4a6f91d42a9b2cd928718162c517119f39a79
parentprofiles/package.mask: mask qemu-5.2.0 for testing (diff)
downloadgentoo-3ef9e5361d90e4a3b60da326db292bdd13322529.tar.gz
gentoo-3ef9e5361d90e4a3b60da326db292bdd13322529.tar.bz2
gentoo-3ef9e5361d90e4a3b60da326db292bdd13322529.zip
app-emulation/qemu: revert "fix safe-stack feature detection"
I misinterpreted what test does. Will need to check why it passes for me. Reverting it for now. This reverts commit 541bb02a46aa817953c29c8ffef222bbfb58ebd8. Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/759331 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch12
-rw-r--r--app-emulation/qemu/qemu-5.2.0.ebuild1
2 files changed, 0 insertions, 13 deletions
diff --git a/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch b/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch
deleted file mode 100644
index 77ed254ab98e..000000000000
--- a/app-emulation/qemu/files/qemu-5.2.0-safe-stack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-If SafeStack fails to build it should be disabled, not enabled.
---- a/configure
-+++ b/configure
-@@ -4956,7 +4956,7 @@ if test "$safe_stack" = "no"; then
- fi
- else # "$safe_stack" = ""
- # Set safe_stack to yes or no based on pre-existing flags
-- if compile_prog "-Werror" ""; then
-+ if ! compile_prog "-Werror" ""; then
- safe_stack="no"
- else
- safe_stack="yes"
diff --git a/app-emulation/qemu/qemu-5.2.0.ebuild b/app-emulation/qemu/qemu-5.2.0.ebuild
index a0c14681fac3..3a200179aa25 100644
--- a/app-emulation/qemu/qemu-5.2.0.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0.ebuild
@@ -225,7 +225,6 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
- "${FILESDIR}"/${PN}-5.2.0-safe-stack.patch
)
QA_PREBUILT="