commit: caad5bb444065318e0df4baa0758ef19e80991c2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 01:33:03 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 01:33:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caad5bb4
sys-libs/compiler-rt: Strip the prefix patch for 12+
The prefix patch no longer applies to 12.0.0_rc1 and newer. Replace
it with an empty file to fix the build while making it easy to readd
a new patch.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild | 2 +-
sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild | 2 +-
sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild | 2 +-
sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild | 2 +-
.../compiler-rt-prefix-paths.patch | 0
.../files/9999/compiler-rt-prefix-paths.patch | 79 ----------------------
6 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
index 88873e2d937..03faac95341 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}/9999/${PN}-prefix-paths.patch"
+ "${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
)
python_check_deps() {
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
index 01907446d0f..a24b2a25ff8 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
@@ -32,7 +32,7 @@ LLVM_COMPONENTS=( compiler-rt )
llvm.org_set_globals
PATCHES=(
- "${FILESDIR}/9999/${PN}-prefix-paths.patch"
+ "${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
)
python_check_deps() {
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild
index 07412646ab2..fb43d386c33 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild
@@ -32,7 +32,7 @@ LLVM_COMPONENTS=( compiler-rt )
llvm.org_set_globals
PATCHES=(
- "${FILESDIR}/9999/${PN}-prefix-paths.patch"
+ "${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
)
python_check_deps() {
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild
index 07412646ab2..fb43d386c33 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild
@@ -32,7 +32,7 @@ LLVM_COMPONENTS=( compiler-rt )
llvm.org_set_globals
PATCHES=(
- "${FILESDIR}/9999/${PN}-prefix-paths.patch"
+ "${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
)
python_check_deps() {
diff --git a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
b/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
similarity index 100%
copy from sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
copy to sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
diff --git a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
b/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
index c27e3c44f68..e69de29bb2d 100644
--- a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
+++ b/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
@@ -1,79 +0,0 @@
---- a/compiler-rt/cmake/config-ix.cmake 2020-10-07 05:10:48.000000000
-0500
-+++ b/compiler-rt/cmake/config-ix.cmake 2020-12-13 16:17:43.000000000
-0600
-@@ -424,10 +424,7 @@
- ${DARWIN_COMMON_LINK_FLAGS}
- ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
-
-- if(DARWIN_osx_SYSROOT)
-- list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
-- list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
-- endif()
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-
- # Figure out which arches to use for each OS
- darwin_get_toolchain_supported_archs(toolchain_arches)
---- a/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:17:13.000000000
-0600
-+++ b/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:18:59.000000000
-0600
-@@ -102,23 +102,8 @@
- endif()
-
- if(APPLE)
-- # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode
but
-- # not the command line tools (or is using macOS 10.14 or newer). If this is
-- # the case, we need to find the OS X sysroot to pass to clang.
-- if(NOT EXISTS /usr/include/c++)
-- execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
-- OUTPUT_VARIABLE OSX_SYSROOT
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
-- message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
-- else()
-- message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
-- set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
-- endif()
-- else()
-- set(OSX_SYSROOT_FLAG "")
-- endif()
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+ set(OSX_SYSROOT_FLAG "")
-
- option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
- option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS -
Experimental" Off)
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-10-07
05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-12-13
16:21:32.000000000 -0600
-@@ -273,7 +273,8 @@
- ${ARGN})
- set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
- add_library(${libname} STATIC ${LIB_SOURCES})
-- if(DARWIN_${LIB_OS}_SYSROOT)
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+ if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
- set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
- endif()
-
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-10-07
05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-12-13
18:12:27.000000000 -0600
-@@ -277,9 +277,10 @@
- if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
- list(APPEND extra_cflags_${libname}
"--target=${CMAKE_C_COMPILER_TARGET}")
- endif()
-+ # Do not add --sysroot flag on Gentoo Prefix (search paths handled by
cmake)
-- if(CMAKE_SYSROOT)
-+ if(CMAKE_SYSROOT AND NOT APPLE)
- list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
- endif()
- string(REPLACE ";" " " extra_cflags_${libname}
"${extra_cflags_${libname}}")
- string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
- ${CMAKE_C_COMPILE_OBJECT})
---- a/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:02.000000000
-0600
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:38.000000000
-0600
-@@ -244,6 +244,7 @@
- # and Clang's versions. As a workaround do not use --sysroot=. on
FreeBSD/NetBSD
- # until this is addressed.
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-+ AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"
- AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- file(GLOB _tsan_generic_sources rtl/tsan*)
- file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
-
