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