From dca110f7654ebcec94bbdf6f7a9868d0ef788ab9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 3 Jul 2016 08:47:21 +0200 Subject: [PATCH] sys-devel/llvm: Sync and clean up WX section code --- sys-devel/llvm/llvm-3.7.1-r3.ebuild | 4 ++-- sys-devel/llvm/llvm-3.8.0-r3.ebuild | 4 ++-- sys-devel/llvm/llvm-9999.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index a76fae770b75..d134a06e519c 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -216,8 +216,8 @@ src_prepare() { # Fix WX sections, bug #421527 find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ + -i {} + || die popd >/dev/null || die fi diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index bc84e8fc5637..0b38f2e58fac 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -214,8 +214,8 @@ src_prepare() { # Fix WX sections, bug #421527 find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ + -i {} + || die popd >/dev/null || die fi diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 148ed8a4286b..745d373ecc3f 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -192,9 +192,9 @@ src_prepare() { eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch # Fix WX sections, bug #421527 - find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} \; || die + find projects/compiler-rt/lib/builtins -type f -name '*.S' -exec sed \ + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ + -i {} + || die fi if use lldb; then -- 2.26.2