Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
Date: Sun, 03 Jul 2016 07:18:00
Message-Id: 1467530264.dca110f7654ebcec94bbdf6f7a9868d0ef788ab9.mgorny@gentoo
1 commit: dca110f7654ebcec94bbdf6f7a9868d0ef788ab9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 06:47:21 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 07:17:44 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca110f7
7
8 sys-devel/llvm: Sync and clean up WX section code
9
10 sys-devel/llvm/llvm-3.7.1-r3.ebuild | 4 ++--
11 sys-devel/llvm/llvm-3.8.0-r3.ebuild | 4 ++--
12 sys-devel/llvm/llvm-9999.ebuild | 6 +++---
13 3 files changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
16 index a76fae7..d134a06 100644
17 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
18 +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
19 @@ -216,8 +216,8 @@ src_prepare() {
20
21 # Fix WX sections, bug #421527
22 find lib/builtins -type f -name '*.S' -exec sed \
23 - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
24 - -i {} + || die
25 + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
26 + -i {} + || die
27
28 popd >/dev/null || die
29 fi
30
31 diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
32 index bc84e8f..0b38f2e 100644
33 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
34 +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
35 @@ -214,8 +214,8 @@ src_prepare() {
36
37 # Fix WX sections, bug #421527
38 find lib/builtins -type f -name '*.S' -exec sed \
39 - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
40 - -i {} + || die
41 + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
42 + -i {} + || die
43
44 popd >/dev/null || die
45 fi
46
47 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
48 index 148ed8a..745d373 100644
49 --- a/sys-devel/llvm/llvm-9999.ebuild
50 +++ b/sys-devel/llvm/llvm-9999.ebuild
51 @@ -192,9 +192,9 @@ src_prepare() {
52 eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
53
54 # Fix WX sections, bug #421527
55 - find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
56 - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
57 - -i {} \; || die
58 + find projects/compiler-rt/lib/builtins -type f -name '*.S' -exec sed \
59 + -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
60 + -i {} + || die
61 fi
62
63 if use lldb; then