1 |
commit: 07c1e410141773d652a4f361b504be1c2527b0a8 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 29 11:05:28 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 29 11:05:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c1e410 |
7 |
|
8 |
sys-libs/compiler-rt-sanitizers: Also strip prefix patch here |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../compiler-rt-sanitizers-11.0.0.ebuild | 2 +- |
13 |
.../compiler-rt-sanitizers-11.0.1.ebuild | 2 +- |
14 |
.../compiler-rt-sanitizers-11.1.0_rc1.ebuild | 2 +- |
15 |
.../compiler-rt-sanitizers-11.1.0_rc2.ebuild | 2 +- |
16 |
.../compiler-rt-prefix-paths.patch | 0 |
17 |
.../files/9999/compiler-rt-prefix-paths.patch | 79 ---------------------- |
18 |
6 files changed, 4 insertions(+), 83 deletions(-) |
19 |
|
20 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
21 |
index 52e9ff58f47..ed18a87d53f 100644 |
22 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
23 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
24 |
@@ -36,7 +36,7 @@ BDEPEND=" |
25 |
${PYTHON_DEPS}" |
26 |
|
27 |
PATCHES=( |
28 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
29 |
+ "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
30 |
) |
31 |
|
32 |
python_check_deps() { |
33 |
|
34 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
35 |
index 249ebcf8e2a..8f8b68d9d0c 100644 |
36 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
37 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
38 |
@@ -49,7 +49,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
39 |
llvm.org_set_globals |
40 |
|
41 |
PATCHES=( |
42 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
43 |
+ "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
44 |
) |
45 |
|
46 |
python_check_deps() { |
47 |
|
48 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc1.ebuild |
49 |
index bc31bbb9893..699bf43e7b6 100644 |
50 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc1.ebuild |
51 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc1.ebuild |
52 |
@@ -49,7 +49,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
53 |
llvm.org_set_globals |
54 |
|
55 |
PATCHES=( |
56 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
57 |
+ "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
58 |
) |
59 |
|
60 |
python_check_deps() { |
61 |
|
62 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc2.ebuild |
63 |
index bc31bbb9893..699bf43e7b6 100644 |
64 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc2.ebuild |
65 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0_rc2.ebuild |
66 |
@@ -49,7 +49,7 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
67 |
llvm.org_set_globals |
68 |
|
69 |
PATCHES=( |
70 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
71 |
+ "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
72 |
) |
73 |
|
74 |
python_check_deps() { |
75 |
|
76 |
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch |
77 |
similarity index 100% |
78 |
copy from sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
79 |
copy to sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch |
80 |
|
81 |
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
82 |
index c27e3c44f68..e69de29bb2d 100644 |
83 |
--- a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
84 |
+++ b/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
85 |
@@ -1,79 +0,0 @@ |
86 |
---- a/compiler-rt/cmake/config-ix.cmake 2020-10-07 05:10:48.000000000 -0500 |
87 |
-+++ b/compiler-rt/cmake/config-ix.cmake 2020-12-13 16:17:43.000000000 -0600 |
88 |
-@@ -424,10 +424,7 @@ |
89 |
- ${DARWIN_COMMON_LINK_FLAGS} |
90 |
- ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION}) |
91 |
- |
92 |
-- if(DARWIN_osx_SYSROOT) |
93 |
-- list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
94 |
-- list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
95 |
-- endif() |
96 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
97 |
- |
98 |
- # Figure out which arches to use for each OS |
99 |
- darwin_get_toolchain_supported_archs(toolchain_arches) |
100 |
---- a/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:17:13.000000000 -0600 |
101 |
-+++ b/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:18:59.000000000 -0600 |
102 |
-@@ -102,23 +102,8 @@ |
103 |
- endif() |
104 |
- |
105 |
- if(APPLE) |
106 |
-- # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but |
107 |
-- # not the command line tools (or is using macOS 10.14 or newer). If this is |
108 |
-- # the case, we need to find the OS X sysroot to pass to clang. |
109 |
-- if(NOT EXISTS /usr/include/c++) |
110 |
-- execute_process(COMMAND xcrun -sdk macosx --show-sdk-path |
111 |
-- OUTPUT_VARIABLE OSX_SYSROOT |
112 |
-- ERROR_QUIET |
113 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE) |
114 |
-- if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT}) |
115 |
-- message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist") |
116 |
-- else() |
117 |
-- message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}") |
118 |
-- set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}") |
119 |
-- endif() |
120 |
-- else() |
121 |
-- set(OSX_SYSROOT_FLAG "") |
122 |
-- endif() |
123 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
124 |
-+ set(OSX_SYSROOT_FLAG "") |
125 |
- |
126 |
- option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On) |
127 |
- option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off) |
128 |
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-10-07 05:10:48.000000000 -0500 |
129 |
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-12-13 16:21:32.000000000 -0600 |
130 |
-@@ -273,7 +273,8 @@ |
131 |
- ${ARGN}) |
132 |
- set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}") |
133 |
- add_library(${libname} STATIC ${LIB_SOURCES}) |
134 |
-- if(DARWIN_${LIB_OS}_SYSROOT) |
135 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
136 |
-+ if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx") |
137 |
- set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT}) |
138 |
- endif() |
139 |
- |
140 |
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-10-07 05:10:48.000000000 -0500 |
141 |
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-12-13 18:12:27.000000000 -0600 |
142 |
-@@ -277,9 +277,10 @@ |
143 |
- if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) |
144 |
- list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}") |
145 |
- endif() |
146 |
-+ # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake) |
147 |
-- if(CMAKE_SYSROOT) |
148 |
-+ if(CMAKE_SYSROOT AND NOT APPLE) |
149 |
- list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}") |
150 |
- endif() |
151 |
- string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}") |
152 |
- string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions |
153 |
- ${CMAKE_C_COMPILE_OBJECT}) |
154 |
---- a/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:02.000000000 -0600 |
155 |
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:38.000000000 -0600 |
156 |
-@@ -244,6 +244,7 @@ |
157 |
- # and Clang's versions. As a workaround do not use --sysroot=. on FreeBSD/NetBSD |
158 |
- # until this is addressed. |
159 |
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" |
160 |
-+ AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" |
161 |
- AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD") |
162 |
- file(GLOB _tsan_generic_sources rtl/tsan*) |
163 |
- file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac* |
164 |
- |