sys-devel/llvm: Sync and clean up WX section code

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index a76fae770b75179c59122f2d87860fbb19b64f6b..d134a06e519c8c225e01674b710ef15f008b0d16 100644 (file)
--- 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 bc84e8fc5637e8d8394e3ffff57ba3cefd8fee07..0b38f2e58fac9cf0c5fd998b2fe9b20ec245baae 100644 (file)
--- 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 148ed8a4286b8870f88fcb8e9a12c6a0a30266bc..745d373ecc3fb10ab08457d6694ab195699dd165 100644 (file)
--- 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