1 |
commit: 184148a287f9c84840a8b3cec607be1ca2aa7623 |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Sat Oct 27 16:44:33 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 29 11:38:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=184148a2 |
7 |
|
8 |
sys-libs/compiler-rt-sanitizers: fix compile for arm |
9 |
|
10 |
.../compiler-rt-sanitizers-6.0.1.ebuild | 4 +++- |
11 |
.../files/0001-fixup-for-interception_type_test.patch | 14 ++++++++++++++ |
12 |
2 files changed, 17 insertions(+), 1 deletion(-) |
13 |
|
14 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild |
15 |
index d2a3805..176e836 100644 |
16 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild |
17 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild |
18 |
@@ -40,7 +40,9 @@ DEPEND=" |
19 |
|
20 |
S=${WORKDIR}/${MY_P} |
21 |
|
22 |
-PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch ) |
23 |
+PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch |
24 |
+ "${FILESDIR}"/0001-fixup-for-interception_type_test.patch |
25 |
+ ) |
26 |
|
27 |
# least intrusive of all |
28 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
29 |
|
30 |
diff --git a/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch b/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch |
31 |
new file mode 100644 |
32 |
index 0000000..746f53c |
33 |
--- /dev/null |
34 |
+++ b/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch |
35 |
@@ -0,0 +1,14 @@ |
36 |
+diff --git a/lib/interception/interception_type_test.cc b/lib/interception/interception_type_test.cc |
37 |
+index 2b3a6d5..21c2fb3 100644 |
38 |
+--- a/lib/interception/interception_type_test.cc |
39 |
++++ b/lib/interception/interception_type_test.cc |
40 |
+@@ -32,8 +32,8 @@ COMPILER_CHECK(sizeof(::OFF64_T) == sizeof(off64_t)); |
41 |
+ // The following are the cases when pread (and friends) is used instead of |
42 |
+ // pread64. In those cases we need OFF_T to match off_t. We don't care about the |
43 |
+ // rest (they depend on _FILE_OFFSET_BITS setting when building an application). |
44 |
+-# if SANITIZER_ANDROID || !defined _FILE_OFFSET_BITS || \ |
45 |
+- _FILE_OFFSET_BITS != 64 |
46 |
++# if SANITIZER_ANDROID || !defined _FILE_OFFSET_BITS && !SANITIZER_NONGNU || \ |
47 |
++ _FILE_OFFSET_BITS != 64 && !SANITIZER_NONGNU |
48 |
+ COMPILER_CHECK(sizeof(::OFF_T) == sizeof(off_t)); |
49 |
+ # endif |