[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
commit: c272e3cd4f02c3b2d4a2073cabdc3e78d6a0d61e Author: Michał Górny gentoo org> AuthorDate: Thu Apr 22 09:49:58 2021 + Commit: Michał Górny gentoo org> CommitDate: Thu Apr 22 09:49:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c272e3cd sys-devel/llvm: Remove stale musl patch Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/files//musl-fixes.patch | 33 -- 1 file changed, 33 deletions(-) diff --git a/sys-devel/llvm/files//musl-fixes.patch b/sys-devel/llvm/files//musl-fixes.patch deleted file mode 100644 index 5c516534abc..000 --- a/sys-devel/llvm/files//musl-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def -index 7798e3c..ade2b96 100644 a/include/llvm/Analysis/TargetLibraryInfo.def -+++ b/include/llvm/Analysis/TargetLibraryInfo.def -@@ -27,6 +27,15 @@ - #define TLI_DEFINE_STRING_INTERNAL(string_repr) string_repr, - #endif - -+// avoid name conflicts with musl-libc -+#undef fopen64 -+#undef fseeko64 -+#undef ftello64 -+#undef fstat64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+ - /// void *new(unsigned int); - TLI_DEFINE_ENUM_INTERNAL(msvc_new_int) - TLI_DEFINE_STRING_INTERNAL("??2@YAPAXI@Z") -diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp -index 9a7aeb5..e98ad80 100644 a/lib/Support/DynamicLibrary.cpp -+++ b/lib/Support/DynamicLibrary.cpp -@@ -143,7 +143,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { - // On linux we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we - // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. --#if defined(__linux__) and !defined(__ANDROID__) -+#if defined(__linux__) && defined(__GLIBC__) - { - EXPLICIT_SYMBOL(stderr); - EXPLICIT_SYMBOL(stdout);
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/11.0.0/, sys-devel/llvm/
commit: 20ab0d476f1f2467cb35a863d36e21dfb48f075b Author: Michał Górny gentoo org> AuthorDate: Wed Oct 28 08:08:41 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Oct 28 08:37:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ab0d47 sys-devel/llvm: Backport tensorflow automagic dep fix Backport patch fixing CMakeLists.txt not to use tensorflow automagically. This also fixes build failure due to our TF packages being incompatible. TF is now always-off. Thanks to Georgy Yakovlev for rebasing and testing the patch. Closes: https://bugs.gentoo.org/748444 Signed-off-by: Michał Górny gentoo.org> ...88371-guard-find_library-tensorflow_c_api.patch | 55 ++ sys-devel/llvm/llvm-11.0.0.ebuild | 6 +++ 2 files changed, 61 insertions(+) diff --git a/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch b/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch new file mode 100644 index 000..73959afb267 --- /dev/null +++ b/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch @@ -0,0 +1,55 @@ +From 8dcb88f7705fb3927938dd9bd103efcabafcefb0 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Tue, 27 Oct 2020 18:20:56 -0700 +Subject: [PATCH] backport D88371, guard `find_library(tensorflow_c_api ...)` + +Differential Revision: https://reviews.llvm.org/D88371 +Signed-off-by: Georgy Yakovlev +--- + llvm/CMakeLists.txt | 15 +++ + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index 1f137f0..4112def 100644 +--- a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +@@ -832,6 +832,11 @@ configure_file( + ${LLVM_INCLUDE_DIR}/llvm/Config/Targets.def + ) + ++# They are not referenced. See set_output_directory(). ++set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) ++set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++ + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # In this case, the latest C API library is available for download from +@@ -840,9 +845,9 @@ configure_file( + # LLVM_HAVE_TF_API, through llvm-config.h, so that a user of the LLVM library may + # also leverage the dependency. + set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install") +-find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib) + +-if (tensorflow_c_api) ++if (TENSORFLOW_C_LIB_PATH) ++ find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib NO_DEFAULT_PATH REQUIRED) + set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available") + include_directories(${TENSORFLOW_C_LIB_PATH}/include) + endif() +@@ -877,12 +882,6 @@ add_custom_target(srpm + COMMAND rpmbuild -bs --define '_topdir ${LLVM_SRPM_DIR}' ${LLVM_SRPM_BINARY_SPECFILE}) + set_target_properties(srpm PROPERTIES FOLDER "Misc") + +- +-# They are not referenced. See set_output_directory(). +-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +-set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +-set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +- + if(APPLE AND DARWIN_LTO_LIBRARY) + set(CMAKE_EXE_LINKER_FLAGS + "${CMAKE_EXE_LINKER_FLAGS} -Wl,-lto_library -Wl,${DARWIN_LTO_LIBRARY}") +-- +2.26.2 + diff --git a/sys-devel/llvm/llvm-11.0.0.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild index 6bdf1c7ec77..ad20115fb6b 100644 --- a/sys-devel/llvm/llvm-11.0.0.ebuild +++ b/sys-devel/llvm/llvm-11.0.0.ebuild @@ -73,6 +73,12 @@ RDEPEND="${RDEPEND} PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" +PATCHES=( + # backport tensorflow finding fix (avoids broken automagic dep) + # https://bugs.gentoo.org/748444 + "${FILESDIR}"/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch +) + python_check_deps() { use doc || return 0
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/10.0.1/, sys-devel/llvm/
commit: 841ecbf26050fc2a3f4a301817d75b6671a2603d Author: Michał Górny gentoo org> AuthorDate: Fri Jun 19 16:05:33 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Jun 19 18:10:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841ecbf2 sys-devel/llvm: Patch bad dylib linking in 10.0.1* Signed-off-by: Michał Górny gentoo.org> ...linking-llvm-cfi-verify-to-duplicate-libs.patch | 48 ++ ...vm-Disable-linking-llvm-exegesis-to-dylib.patch | 29 + sys-devel/llvm/llvm-10.0.1..ebuild | 4 ++ sys-devel/llvm/llvm-10.0.1_rc1.ebuild | 4 ++ 4 files changed, 85 insertions(+) diff --git a/sys-devel/llvm/files/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch b/sys-devel/llvm/files/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch new file mode 100644 index 000..2ca21bc --- /dev/null +++ b/sys-devel/llvm/files/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch @@ -0,0 +1,48 @@ +From bc3be897be6994da7f52ba1b5735aa81150084a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 16 Jun 2020 12:16:52 +0200 +Subject: [PATCH 1/4] [llvm] Avoid linking llvm-cfi-verify to duplicate libs + +Fix the CMake rules for LLVMCFIVerify library not to pull duplicate +LLVM .a libraries when linking to the dylib. This prevents problems +due to duplicate symbols and apparently fixes mingw32. + +This is an alternative approach to D44650 that just forces .a libraries +instead. However, there doesn't seem to be any reason to do that. +--- + tools/llvm-cfi-verify/lib/CMakeLists.txt | 20 +++ + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/tools/llvm-cfi-verify/lib/CMakeLists.txt b/tools/llvm-cfi-verify/lib/CMakeLists.txt +index 82ca42e624a..41d55ed9321 100644 +--- a/tools/llvm-cfi-verify/lib/CMakeLists.txt b/tools/llvm-cfi-verify/lib/CMakeLists.txt +@@ -7,13 +7,17 @@ add_library(LLVMCFIVerify + ) + + llvm_update_compile_flags(LLVMCFIVerify) +-llvm_map_components_to_libnames(libs +- DebugInfoDWARF +- MC +- MCParser +- Object +- Support +- Symbolize +- ) ++if (LLVM_LINK_LLVM_DYLIB) ++ set(libs LLVM) ++else() ++ llvm_map_components_to_libnames(libs ++DebugInfoDWARF ++MC ++MCParser ++Object ++Support ++Symbolize ++) ++endif() + target_link_libraries(LLVMCFIVerify ${libs}) + set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries") +-- +2.27.0 + diff --git a/sys-devel/llvm/files/10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch b/sys-devel/llvm/files/10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch new file mode 100644 index 000..3dcfad0a513 --- /dev/null +++ b/sys-devel/llvm/files/10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch @@ -0,0 +1,29 @@ +From 07b6fdcde1ed64043244965b97788a2b12af4d6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 16 Jun 2020 12:31:36 +0200 +Subject: [PATCH 2/4] [llvm] Disable linking llvm-exegesis to dylib + +Force linking llvm-exegesis to static LLVM libraries instead of dylib +to prevent duplicate symbols due to linking both. Ideally, we'd want +to link to the dylib only here but the target sub-libraries use hidden +symbols from LLVM target libraries and therefore linking the dylib +fails. +--- + tools/llvm-exegesis/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/llvm-exegesis/CMakeLists.txt b/tools/llvm-exegesis/CMakeLists.txt +index a59e1b74024..0575f2a06bb 100644 +--- a/tools/llvm-exegesis/CMakeLists.txt b/tools/llvm-exegesis/CMakeLists.txt +@@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS + ) + + add_llvm_tool(llvm-exegesis ++ DISABLE_LLVM_LINK_LLVM_DYLIB + llvm-exegesis.cpp + ) + +-- +2.27.0 + diff --git a/sys-devel/llvm/llvm-10.0.1..ebuild b/sys-devel/llvm/llvm-10.0.1..ebuild index f308f41ee44..ccddd737630 100644 --- a/sys-devel/llvm/llvm-10.0.1..ebuild +++ b/sys-devel/llvm/llvm-10.0.1..ebuild @@ -174,6 +174,10 @@ src_prepare() { # https://bugs.gentoo.org/show_bug.cgi?id=565358 eapply "${FILESDIR}"//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + # Fix linking to dylib and .a libs simultaneously + eapply "${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch + eapply "${FILESDIR}"/10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch + # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die diff --git a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild index 59ccce09861..69e7f467ecd 100644 --- a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild +++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild @@ -142,6 +142,10 @@ src_prepare() { # https://bugs.gentoo.org/show_bug.cgi?id=565358
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/7.1.0/, sys-devel/llvm/
commit: d4e9d4d1157d7240be88319337e6da90de5f7329 Author: Michał Górny gentoo org> AuthorDate: Fri May 1 08:47:06 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri May 1 08:54:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e9d4d1 sys-devel/llvm: Remove 7* Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/Manifest| 2 - ...-Clean-up-exported-values-update-for-shar.patch | 54 - sys-devel/llvm/llvm-7.1.0.ebuild | 262 - 3 files changed, 318 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index de4025d4719..1975b92af9f 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,6 +1,4 @@ DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7 -DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f -DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764 diff --git a/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch deleted file mode 100644 index 5def55d38fc..000 --- a/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 628b899be14a6bab4b32dbd53aabd447dcc16cb7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sat, 20 Aug 2016 23:47:41 +0200 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- making --src-root return invalid path (/dev/null). - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 744fa4e44d1..593788aaef3 100644 a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - set(LLVM_DYLIB_VERSION
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/6.0.1/, sys-devel/llvm/
commit: 3963b591fec2204ebb8c0952b0f2ff6b942a711c Author: Michał Górny gentoo org> AuthorDate: Sun Dec 8 09:43:10 2019 + Commit: Michał Górny gentoo org> CommitDate: Mon Dec 9 19:20:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3963b591 sys-devel/llvm: Remove 6* Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/Manifest| 2 - ...pend-Wl-rpath-link-conditionally-to-GNULD.patch | 38 --- ...c-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch | 314 - ...6DomainReassignment-from-creating-copies-.patch | 110 sys-devel/llvm/llvm-6.0.1-r2.ebuild| 272 -- sys-devel/llvm/llvm-6.0.1.ebuild | 264 - 6 files changed, 1000 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 5c7b9c94b5b..ac97f87f99b 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,5 +1,3 @@ -DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3 -DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073 diff --git a/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch b/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch deleted file mode 100644 index 5d1f042164e..000 --- a/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a7c94b20187a60cf1508ce882ee37b3a056eb0bd Mon Sep 17 00:00:00 2001 -From: Michal Gorny -Date: Thu, 8 Mar 2018 15:09:38 + -Subject: [PATCH] [cmake] Append -Wl,-rpath-link conditionally to GNULD - -Append -Wl,-rpath-link conditionally to whether GNU ld.bfd is used -rather than the Linux+!gold conditionals. Also move it out of 'else' -branch of *BSD handling. This fixes build failures with ld.bfd -on Gentoo/FreeBSD, and should cause no harm on other systems using -ld.bfd. - -This patch improves the original logic by reusing results of linker -detection introduced in r307852. - -Differential Revision: https://reviews.llvm.org/D43751 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327007 91177308-0d34-0410-b5e6-96231b3b80d8 - cmake/modules/AddLLVM.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 20166d2cd30..95d47d00e51 100644 a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -1589,7 +1589,8 @@ function(llvm_setup_rpath name) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY -LINK_FLAGS " -Wl,-z,origin ") --elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_LINKER_IS_GOLD) -+endif() -+if(LLVM_LINKER_IS_GNULD) - # $ORIGIN is not interpreted at link time by ld.bfd - set_property(TARGET ${name} APPEND_STRING PROPERTY -LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ") --- -2.16.2 - diff --git a/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch b/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch deleted file mode 100644 index eac5fe44178..000 --- a/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch +++ /dev/null @@ -1,314 +0,0 @@ -From 9ff352cb602d5dd68bcd7bf2ba4711c8568271a9 Mon Sep 17 00:00:00 2001 -From:
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/8.0.0/, sys-devel/llvm/
commit: 76b66a5ccbe113fcf7702d2d75ada777234b861a Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 18:27:24 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 18:57:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b66a5c sys-devel/llvm: Drop redundant 8.0.0 Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/Manifest| 2 - ...Add-additional-headers-only-if-they-exist.patch | 41 --- sys-devel/llvm/llvm-8.0.0.ebuild | 300 - 3 files changed, 343 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index ed2fa13e9b2..b0f6afbed2b 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -2,8 +2,6 @@ DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df545 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a -DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb -DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764 diff --git a/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch b/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch deleted file mode 100644 index ed83244de53..000 --- a/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001 -From: Michal Gorny -Date: Thu, 4 Apr 2019 14:21:38 + -Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist - -Modify the add_header_files_for_glob() function to only add files -that do exist, rather than all matches of the glob. This fixes CMake -error when one of the include directories (which happen to include -/usr/include) contain broken symlinks. - -Differential Revision: https://reviews.llvm.org/D59632 - -llvm-svn: 357701 - llvm/cmake/modules/LLVMProcessSources.cmake | 10 +- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake -index 7cbd2863500..d0be0e8b3ba 100644 a/cmake/modules/LLVMProcessSources.cmake -+++ b/cmake/modules/LLVMProcessSources.cmake -@@ -30,7 +30,15 @@ endmacro(add_td_sources) - - function(add_header_files_for_glob hdrs_out glob) - file(GLOB hds ${glob}) -- set(${hdrs_out} ${hds} PARENT_SCOPE) -+ set(filtered) -+ foreach(file ${hds}) -+# Explicit existence check is necessary to filter dangling symlinks -+# out. See https://bugs.gentoo.org/674662. -+
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/7.0.9999/, sys-devel/llvm/files/7.1.0/, sys-devel/llvm/
commit: fe2b8bb726162559078bc4578d874cb43aa962b3 Author: Michał Górny gentoo org> AuthorDate: Fri Apr 19 19:48:24 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Apr 19 20:10:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2b8bb7 sys-devel/llvm: Remove 7.0. Signed-off-by: Michał Górny gentoo.org> ...-Clean-up-exported-values-update-for-shar.patch | 0 sys-devel/llvm/llvm-4.0.1-r1.ebuild| 2 +- sys-devel/llvm/llvm-5.0.2.ebuild | 2 +- sys-devel/llvm/llvm-6.0.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-6.0.1.ebuild | 2 +- sys-devel/llvm/llvm-7.0.1.ebuild | 2 +- sys-devel/llvm/llvm-7.0..ebuild| 258 - sys-devel/llvm/llvm-7.1.0.ebuild | 2 +- 8 files changed, 6 insertions(+), 264 deletions(-) diff --git a/sys-devel/llvm/files/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch similarity index 100% rename from sys-devel/llvm/files/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch rename to sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild index 405b1bf4ea6..410573dc10b 100644 --- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild +++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild @@ -73,7 +73,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Backport the fix for dlclose() causing option parser mess # e.g. https://bugs.gentoo.org/617154 diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild index 29bd7b64407..dbda3db29a2 100644 --- a/sys-devel/llvm/llvm-5.0.2.ebuild +++ b/sys-devel/llvm/llvm-5.0.2.ebuild @@ -76,7 +76,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Apply the backported patches eapply "${WORKDIR}/llvm-5.0.1-patchset" diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild index b0e6b8982dc..7a983e01f19 100644 --- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild +++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild @@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild index d4cb259ec03..fde2a075f4d 100644 --- a/sys-devel/llvm/llvm-6.0.1.ebuild +++ b/sys-devel/llvm/llvm-6.0.1.ebuild @@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch diff --git a/sys-devel/llvm/llvm-7.0.1.ebuild b/sys-devel/llvm/llvm-7.0.1.ebuild index 9807a13f1bb..72fae375763 100644 --- a/sys-devel/llvm/llvm-7.0.1.ebuild +++ b/sys-devel/llvm/llvm-7.0.1.ebuild @@ -79,7 +79,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die diff --git
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/6.0.1/, sys-devel/llvm/files/7.0.0/, sys-devel/llvm/
commit: 99c388302385a655b8da39a7769f984c5724f58a Author: Michał Górny gentoo org> AuthorDate: Sun Dec 30 11:33:51 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 30 11:39:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c38830 sys-devel/llvm: Move old 7.0.0 patch to 6.0.1 Signed-off-by: Michał Górny gentoo.org> .../0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch}| 0 sys-devel/llvm/llvm-6.0.1-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch b/sys-devel/llvm/files/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch similarity index 100% rename from sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch rename to sys-devel/llvm/files/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild index cd4c7fd72ce..b0e6b8982dc 100644 --- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild +++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild @@ -89,7 +89,7 @@ src_prepare() { # Fix x86 codegen bug triggered by Chromium # https://bugs.gentoo.org/664868 - eapply "${FILESDIR}"/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch + eapply "${FILESDIR}"/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/7.0.9999/, sys-devel/llvm/, sys-devel/llvm/files/9999/
commit: 78485cd14bd02fa17405bb27357fc27f63e795c8 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 14 17:34:20 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 14 17:35:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78485cd1 sys-devel/llvm: Update llvm-config patch Signed-off-by: Michał Górny gentoo.org> ...ig-Clean-up-exported-values-update-for-shar.patch | 0 ...ig-Clean-up-exported-values-update-for-shar.patch | 20 sys-devel/llvm/llvm-4.0.1-r1.ebuild | 2 +- sys-devel/llvm/llvm-5.0.2.ebuild | 2 +- sys-devel/llvm/llvm-6.0.1-r1.ebuild | 2 +- sys-devel/llvm/llvm-6.0.1-r2.ebuild | 2 +- sys-devel/llvm/llvm-6.0.1.ebuild | 2 +- sys-devel/llvm/llvm-7.0.0-r1.ebuild | 2 +- sys-devel/llvm/llvm-7.0.0.ebuild | 2 +- sys-devel/llvm/llvm-7.0.1_rc2.ebuild | 2 +- sys-devel/llvm/llvm-7.0..ebuild | 2 +- 11 files changed, 9 insertions(+), 29 deletions(-) diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch similarity index 100% copy from sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch copy to sys-devel/llvm/files/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch index 5def55d38fc..cf52314ce75 100644 --- a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch @@ -5,7 +5,6 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared linking Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, - making --src-root return invalid path (/dev/null). Thanks to Steven Newbury for the initial patch. @@ -13,25 +12,6 @@ Thanks to Steven Newbury for the initial patch. Bug: https://bugs.gentoo.org/565358 Bug: https://bugs.gentoo.org/501684 -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 744fa4e44d1..593788aaef3 100644 a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}") diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index d780094861c..c61c72ff48c 100644 --- a/tools/llvm-config/llvm-config.cpp diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild index 1df06e2d848..405b1bf4ea6 100644 --- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild +++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild @@ -73,7 +73,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + eapply "${FILESDIR}"/7.0./0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Backport the fix for dlclose() causing option parser mess # e.g. https://bugs.gentoo.org/617154 diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild index a90d48e4c36..29bd7b64407 100644 --- a/sys-devel/llvm/llvm-5.0.2.ebuild +++ b/sys-devel/llvm/llvm-5.0.2.ebuild @@ -76,7 +76,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/7.0.0/, sys-devel/llvm/
commit: cf5cbc3700bc996519f9c5273973f58e6ec3d580 Author: Michał Górny gentoo org> AuthorDate: Tue Oct 2 17:56:57 2018 + Commit: Michał Górny gentoo org> CommitDate: Tue Oct 2 18:40:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5cbc37 sys-devel/llvm: Backport X86 codegen bugfix for Chromium builds Backport the X86 codegen fix to 7.0.0 and 6.0.1, to ~arch. Hopefully people will get this along with libffi-enforced rebuild. We can stabilize 6.0.1-r2 either when stable users start hitting this, or when libffi gets stable. Bug: https://bugs.gentoo.org/664868 Signed-off-by: Michał Górny gentoo.org> ...6DomainReassignment-from-creating-copies-.patch | 110 + sys-devel/llvm/llvm-6.0.1-r2.ebuild| 270 + sys-devel/llvm/llvm-7.0.0-r1.ebuild| 264 3 files changed, 644 insertions(+) diff --git a/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch b/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch new file mode 100644 index 000..f38907cdd4c --- /dev/null +++ b/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch @@ -0,0 +1,110 @@ +From 72da952b396f43d2ce6ca20a0f0d75212fea6b28 Mon Sep 17 00:00:00 2001 +From: Craig Topper +Date: Mon, 1 Oct 2018 07:08:41 + +Subject: [PATCH] [X86] Stop X86DomainReassignment from creating copies between + GR8/GR16 physical registers and k-registers. + +We can only copy between a k-register and a GR32/GR64 register. + +This patch detects that the copy will be illegal and prevents the domain reassignment from happening for that closure. + +This probably isn't the best fix, and we should probably figure out how to handle this correctly. + +Fixes PR38803. + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343443 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Target/X86/X86DomainReassignment.cpp | 21 +++ + test/CodeGen/X86/pr38803.ll | 48 + 2 files changed, 69 insertions(+) + create mode 100644 test/CodeGen/X86/pr38803.ll + +diff --git a/lib/Target/X86/X86DomainReassignment.cpp b/lib/Target/X86/X86DomainReassignment.cpp +index 5196446b39e..62588e9509d 100644 +--- a/lib/Target/X86/X86DomainReassignment.cpp b/lib/Target/X86/X86DomainReassignment.cpp +@@ -217,6 +217,27 @@ public: + InstrCOPYReplacer(unsigned SrcOpcode, RegDomain DstDomain, unsigned DstOpcode) + : InstrReplacer(SrcOpcode, DstOpcode), DstDomain(DstDomain) {} + ++ bool isLegal(const MachineInstr *MI, ++ const TargetInstrInfo *TII) const override { ++if (!InstrConverterBase::isLegal(MI, TII)) ++ return false; ++ ++// Don't allow copies to/flow GR8/GR16 physical registers. ++// FIXME: Is there some better way to support this? ++unsigned DstReg = MI->getOperand(0).getReg(); ++if (TargetRegisterInfo::isPhysicalRegister(DstReg) && ++(X86::GR8RegClass.contains(DstReg) || ++ X86::GR16RegClass.contains(DstReg))) ++ return false; ++unsigned SrcReg = MI->getOperand(1).getReg(); ++if (TargetRegisterInfo::isPhysicalRegister(SrcReg) && ++(X86::GR8RegClass.contains(SrcReg) || ++ X86::GR16RegClass.contains(SrcReg))) ++ return false; ++ ++return true; ++ } ++ + double getExtraCost(const MachineInstr *MI, + MachineRegisterInfo *MRI) const override { + assert(MI->getOpcode() == TargetOpcode::COPY && "Expected a COPY"); +diff --git a/test/CodeGen/X86/pr38803.ll b/test/CodeGen/X86/pr38803.ll +new file mode 100644 +index 000..a1ca27d89b0 +--- /dev/null b/test/CodeGen/X86/pr38803.ll +@@ -0,0 +1,48 @@ ++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ++; RUN: llc < %s -mcpu=skylake-avx512 -mtriple=x86_64-unknown-unknown | FileCheck %s ++ ++@b = local_unnamed_addr global i32 0, align 4 ++@c = local_unnamed_addr global i32 0, align 4 ++@d = local_unnamed_addr global float 0.00e+00, align 4 ++ ++define float @_Z3fn2v() { ++; CHECK-LABEL: _Z3fn2v: ++; CHECK: # %bb.0: # %entry ++; CHECK-NEXT:pushq %rax ++; CHECK-NEXT:.cfi_def_cfa_offset 16 ++; CHECK-NEXT:callq _Z1av ++; CHECK-NEXT:# kill: def $al killed $al def $eax ++; CHECK-NEXT:kmovd %eax, %k1 ++; CHECK-NEXT:vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero ++; CHECK-NEXT:vmovss %xmm0, %xmm0, %xmm0 {%k1} {z} ++; CHECK-NEXT:cmpl $0, {{.*}}(%rip) ++; CHECK-NEXT:je .LBB0_2 ++; CHECK-NEXT: # %bb.1: # %if.then ++; CHECK-NEXT:vcvtsi2ssl {{.*}}(%rip), %xmm1, %xmm1 ++; CHECK-NEXT:kmovd %eax, %k1 ++; CHECK-NEXT:vxorps %xmm2, %xmm2, %xmm2 ++; CHECK-NEXT:vmovss %xmm2, %xmm0, %xmm1 {%k1} ++; CHECK-NEXT:vmovss %xmm1, {{.*}}(%rip) ++; CHECK-NEXT: .LBB0_2: # %if.end ++; CHECK-NEXT:popq %rax ++; CHECK-NEXT:.cfi_def_cfa_offset 8 ++;
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/6.0.1/, sys-devel/llvm/
commit: d4850f51bb1610a9c16ee5d6da6515e6aefff8f9 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 16 17:52:17 2018 + Commit: Michał Górny gentoo org> CommitDate: Thu Aug 16 18:49:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4850f51 sys-devel/llvm: Backport binutils compatibility patch to 6.0.1 Backport the patch necessary to make LLVM assembly compatible with new restrictions in binutils-2.31.1. Closes: https://bugs.gentoo.org/663442 ...c-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch | 314 + sys-devel/llvm/llvm-6.0.1-r1.ebuild| 266 + 2 files changed, 580 insertions(+) diff --git a/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch b/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch new file mode 100644 index 000..eac5fe44178 --- /dev/null +++ b/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch @@ -0,0 +1,314 @@ +From 9ff352cb602d5dd68bcd7bf2ba4711c8568271a9 Mon Sep 17 00:00:00 2001 +From: George Rimar +Date: Tue, 20 Feb 2018 10:17:57 + +Subject: [PATCH] [llvm-mc] - Produce R_X86_64_PLT32 for "call/jmp foo". + +For instructions like call foo and jmp foo patch changes +relocation produced from R_X86_64_PC32 to R_X86_64_PLT32. +Relocation can be used as a marker for 32-bit PC-relative branches. +Linker will reduce PLT32 relocation to PC32 if function is defined locally. + +Differential revision: https://reviews.llvm.org/D43383 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@325569 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 3 ++ + .../X86/MCTargetDesc/X86ELFObjectWriter.cpp | 3 ++ + lib/Target/X86/MCTargetDesc/X86FixupKinds.h | 1 + + .../X86/MCTargetDesc/X86MCCodeEmitter.cpp | 32 +-- + .../X86/MCTargetDesc/X86MachObjectWriter.cpp | 1 + + .../MCTargetDesc/X86WinCOFFObjectWriter.cpp | 1 + + test/CodeGen/X86/cmp.ll | 2 +- + test/CodeGen/X86/fma.ll | 8 ++--- + test/MC/ELF/basic-elf-64.s| 18 ++- + test/MC/ELF/ifunc-reloc.s | 2 +- + test/MC/ELF/weak-diff.s | 2 +- + test/MC/ELF/weak-relocation.s | 2 +- + test/MC/ELF/weakref-reloc.s | 2 +- + 13 files changed, 58 insertions(+), 19 deletions(-) + +diff --git a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp +index 34db5918926..b301722b535 100644 +--- a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp +@@ -46,6 +46,7 @@ static unsigned getFixupKindLog2Size(unsigned Kind) { + case X86::reloc_signed_4byte: + case X86::reloc_signed_4byte_relax: + case X86::reloc_global_offset_table: ++ case X86::reloc_branch_4byte_pcrel: + case FK_SecRel_4: + case FK_Data_4: + return 2; +@@ -95,6 +96,7 @@ public: + {"reloc_signed_4byte_relax", 0, 32, 0}, + {"reloc_global_offset_table", 0, 32, 0}, + {"reloc_global_offset_table8", 0, 64, 0}, ++{"reloc_branch_4byte_pcrel", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, + }; + + if (Kind < FirstTargetFixupKind) +@@ -102,6 +104,7 @@ public: + + assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() && +"Invalid kind!"); ++assert(Infos[Kind - FirstTargetFixupKind].Name && "Empty fixup name!"); + return Infos[Kind - FirstTargetFixupKind]; + } + +diff --git a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp +index 4cdbae4d0d9..2ecbb80cd06 100644 +--- a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp +@@ -75,6 +75,9 @@ static X86_64RelType getType64(unsigned Kind, + case X86::reloc_riprel_4byte_relax_rex: + case X86::reloc_riprel_4byte_movq_load: + return RT64_32; ++ case X86::reloc_branch_4byte_pcrel: ++Modifier = MCSymbolRefExpr::VK_PLT; ++return RT64_32; + case FK_PCRel_2: + case FK_Data_2: + return RT64_16; +diff --git a/lib/Target/X86/MCTargetDesc/X86FixupKinds.h b/lib/Target/X86/MCTargetDesc/X86FixupKinds.h +index dfdc9ec29ae..3c04b13e002 100644 +--- a/lib/Target/X86/MCTargetDesc/X86FixupKinds.h b/lib/Target/X86/MCTargetDesc/X86FixupKinds.h +@@ -30,6 +30,7 @@ enum Fixups { + // of the instruction. Used only + // for _GLOBAL_OFFSET_TABLE_. + reloc_global_offset_table8,// 64-bit variant. ++ reloc_branch_4byte_pcrel, // 32-bit PC relative branch. + // Marker + LastTargetFixupKind, + NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind +diff --git a/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/6.0.1/, sys-devel/llvm/, sys-devel/llvm/files/6.0.9999/
commit: a78e957d3f8dfe02737d0827c7cfe65e8f1d7cd9 Author: Michał Górny gentoo org> AuthorDate: Wed Aug 15 20:32:45 2018 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 15 20:32:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78e957d sys-devel/llvm: Drop 6.0. ...pend-Wl-rpath-link-conditionally-to-GNULD.patch | 0 sys-devel/llvm/llvm-5.0.2.ebuild | 2 +- sys-devel/llvm/llvm-6.0.1.ebuild | 2 +- sys-devel/llvm/llvm-6.0..ebuild| 255 - 4 files changed, 2 insertions(+), 257 deletions(-) diff --git a/sys-devel/llvm/files/6.0./0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch b/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch similarity index 100% rename from sys-devel/llvm/files/6.0./0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch rename to sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild index 02bf7d715a4..a90d48e4c36 100644 --- a/sys-devel/llvm/llvm-5.0.2.ebuild +++ b/sys-devel/llvm/llvm-5.0.2.ebuild @@ -84,7 +84,7 @@ src_prepare() { cp {"${WORKDIR}/llvm-5.0.1-patchset",.}/test/tools/llvm-symbolizer/Inputs/print_context.o || die # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). - eapply "${FILESDIR}"/6.0./0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch + eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch # gcc-8 build failure eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild index 5df2671c363..a1989293ef7 100644 --- a/sys-devel/llvm/llvm-6.0.1.ebuild +++ b/sys-devel/llvm/llvm-6.0.1.ebuild @@ -81,7 +81,7 @@ src_prepare() { eapply "${FILESDIR}"//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). - eapply "${FILESDIR}"/6.0./0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch + eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die diff --git a/sys-devel/llvm/llvm-6.0..ebuild b/sys-devel/llvm/llvm-6.0..ebuild deleted file mode 100644 index b8768df35d5..000 --- a/sys-devel/llvm/llvm-6.0..ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \ - multiprocessing pax-utils python-any-r1 toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="https://llvm.org/; -SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git; -EGIT_BRANCH="release_60" - -# Keep in sync with CMakeLists.txt -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - -# Additional licenses: -# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. -# 2. ARM backend: LLVM Software Grant by ARM. -# 3. MD5 code: public-domain. -# 4. Tests (not installed): -# a. gtest: BSD. -# b. YAML tests: MIT. - -LICENSE="UoI-NCSA rc BSD public-domain - llvm_targets_ARM? ( LLVM-Grant )" -SLOT="$(ver_cut 1)" -KEYWORDS="" -IUSE="debug doc gold libedit +libffi ncurses test xar xml - kernel_Darwin ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:0= - gold? ( >=sys-devel/binutils-2.22:*[cxx] ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - xar? ( app-arch/xar ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} - dev-lang/perl - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - kernel_Darwin? ( - =sys-devel/binutils-apple-5.1 - ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - !!https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/6.0.0/, sys-devel/llvm/
commit: 431e62145713429c2989f4ed4355f5e4a0744c6e Author: Michał Górny gentoo org> AuthorDate: Wed Apr 25 08:21:14 2018 + Commit: Michał Górny gentoo org> CommitDate: Wed Apr 25 14:36:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431e6214 sys-devel/llvm: Backport LLVMInitializeInstCombine patch to 6.0.0 Backport the fix for LLVMInitializeInstCombine being compiled as C++ function instead of 'extern "C"'. This fixes undefined symbol for programs using this function, in particular dev-python/llvmlite. .../llvm/files/6.0.0/0001-Merging-r326843.patch| 36 +++ sys-devel/llvm/llvm-6.0.0-r1.ebuild| 265 + 2 files changed, 301 insertions(+) diff --git a/sys-devel/llvm/files/6.0.0/0001-Merging-r326843.patch b/sys-devel/llvm/files/6.0.0/0001-Merging-r326843.patch new file mode 100644 index 000..bf0a002931b --- /dev/null +++ b/sys-devel/llvm/files/6.0.0/0001-Merging-r326843.patch @@ -0,0 +1,36 @@ +From 2c0569c71d33fb84af35887d012c039c0d8d0add Mon Sep 17 00:00:00 2001 +From: Tom Stellard+Date: Sat, 7 Apr 2018 03:59:05 + +Subject: [PATCH] Merging r326843: + + +r326843 | eugenezelenko | 2018-03-06 15:06:13 -0800 (Tue, 06 Mar 2018) | 6 lines + +[Transforms] Add missing header for InstructionCombining.cpp, in order to export LLVMInitializeInstCombine as extern "C". Fixes PR35947. + +Patch by Brenton Bostick. + +Differential revision: https://reviews.llvm.org/D44140 + + + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@329480 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Transforms/InstCombine/InstructionCombining.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp +index b332e75c7fe..35ed592ac07 100644 +--- a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp +@@ -34,6 +34,7 @@ + //===--===// + + #include "InstCombineInternal.h" ++#include "llvm-c/Initialization.h" + #include "llvm/ADT/APInt.h" + #include "llvm/ADT/ArrayRef.h" + #include "llvm/ADT/DenseMap.h" +-- +2.17.0 + diff --git a/sys-devel/llvm/llvm-6.0.0-r1.ebuild b/sys-devel/llvm/llvm-6.0.0-r1.ebuild new file mode 100644 index 000..9a8bed537eb --- /dev/null +++ b/sys-devel/llvm/llvm-6.0.0-r1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +# (needed due to CMAKE_BUILD_TYPE != Gentoo) +CMAKE_MIN_VERSION=3.7.0-r1 +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \ + multiprocessing pax-utils python-any-r1 toolchain-funcs + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="https://llvm.org/; +SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz + !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )" + +# Keep in sync with CMakeLists.txt +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC Sparc SystemZ X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) + +# Additional licenses: +# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. +# 2. ARM backend: LLVM Software Grant by ARM. +# 3. MD5 code: public-domain. +# 4. Tests (not installed): +# a. gtest: BSD. +# b. YAML tests: MIT. + +LICENSE="UoI-NCSA rc BSD public-domain + llvm_targets_ARM? ( LLVM-Grant )" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug doc gold libedit +libffi ncurses test xar xml + kernel_Darwin ${ALL_LLVM_TARGETS[*]}" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib:0= + gold? ( >=sys-devel/binutils-2.22:*[cxx] ) + libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) + libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) + xar? ( app-arch/xar ) + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )" +# configparser-3.2 breaks the build (3.3 or none at all are fine) +DEPEND="${RDEPEND} + dev-lang/perl + || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 + ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) + ) + kernel_Darwin? ( + =sys-devel/binutils-apple-5.1 + ) + doc? ( dev-python/sphinx ) + gold? ( sys-libs/binutils-libs ) + libffi? ( virtual/pkgconfig ) + !!https://bugs.gentoo.org/show_bug.cgi?id=565358 + eapply
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/5.0.1/, sys-devel/llvm/
commit: a5b09ba6299928f91142fee85a45cad4068182fd Author: Michał Górny gentoo org> AuthorDate: Thu Dec 21 18:12:15 2017 + Commit: Michał Górny gentoo org> CommitDate: Thu Dec 21 21:01:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b09ba6 sys-devel/llvm: Backport symbolizer test fix to 5.0.1 Backport upstream commits fixing the sanitizer tests to be more reliable. While at it, move the single old patch to the patchset tarball. No revbump since it is merely a test suite fix. Closes: https://bugs.gentoo.org/632267 sys-devel/llvm/Manifest| 1 + ...Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch | 71 -- sys-devel/llvm/llvm-5.0.1.ebuild | 8 ++- 3 files changed, 6 insertions(+), 74 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index c7026530114..465993b1fcf 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -30,6 +30,7 @@ DIST llvm-3.9.1.src.tar.xz 18130436 BLAKE2B 90afd2c06e612132bbc84c29fed59abdfdae DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07 SHA512 3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334 +DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415 DIST llvm-manpages-5.0.0.tar.bz2 94240 BLAKE2B 1657edefa2e839f401b7c30ba1c0cfde45bcb0fa9bcfc3ea6070bc0addc237be898c5a79e54b2120f98b2a9550ab286cfd0bc835751a4e8cc30005d4081fb9f9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea diff --git a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch deleted file mode 100644 index 21702748893..000 --- a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001 -From: Michal Gorny-Date: Mon, 27 Nov 2017 22:23:09 + -Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading - -Prevent unloading shared libraries on Linux when dlclose() is called. -This is necessary since command-line option parsing API relies on -registering the global option instances in the option parser instance -which can be loaded in a different shared library. - -Given that we can't reliably remove those options when a library is -unloaded, the parser ends up containing dangling references. Since glibc -has relatively complex library unloading rules, some of the LLVM -libraries can be unloaded while others (including the Support library) -stay loaded causing quite a mayhem. To reliably prevent that, just -forbid unloading all libraries -- it's a very bad idea anyway. - -While the issue arguably happens only with BUILD_SHARED_LIBS, it may -affect any library reusing llvm::cl interface. - -Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154. -Previously hit by Fedora back in Feb 2016: -https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html - -Differential Revision: https://reviews.llvm.org/D40459 - -git-svn-id:
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/4.0.1/, sys-devel/llvm/files/5.0.1/, sys-devel/llvm/
commit: 3f7b543082fa986823d08a1df44eb8bf634f10df Author: Michał Górny gentoo org> AuthorDate: Fri Dec 1 16:23:42 2017 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 1 23:40:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7b5430 sys-devel/llvm: Backport unloading prevention fix Bug: https://bugs.gentoo.org/617154 ...Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch | 56 + ...Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch | 71 ++ .../{llvm-4.0.1.ebuild => llvm-4.0.1-r1.ebuild}| 4 ++ sys-devel/llvm/llvm-5.0.1_rc2.ebuild | 4 ++ sys-devel/llvm/llvm-5.0..ebuild| 4 ++ 5 files changed, 139 insertions(+) diff --git a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch new file mode 100644 index 000..b857136498b --- /dev/null +++ b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch @@ -0,0 +1,56 @@ +From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001 +From: Michal Gorny+Date: Mon, 27 Nov 2017 22:23:09 + +Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading + +Prevent unloading shared libraries on Linux when dlclose() is called. +This is necessary since command-line option parsing API relies on +registering the global option instances in the option parser instance +which can be loaded in a different shared library. + +Given that we can't reliably remove those options when a library is +unloaded, the parser ends up containing dangling references. Since glibc +has relatively complex library unloading rules, some of the LLVM +libraries can be unloaded while others (including the Support library) +stay loaded causing quite a mayhem. To reliably prevent that, just +forbid unloading all libraries -- it's a very bad idea anyway. + +While the issue arguably happens only with BUILD_SHARED_LIBS, it may +affect any library reusing llvm::cl interface. + +Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154. +Previously hit by Fedora back in Feb 2016: +https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html + +Differential Revision: https://reviews.llvm.org/D40459 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + cmake/modules/HandleLLVMOptions.cmake | 8 + unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++ + 2 files changed, 15 insertions(+) + + 4.0.1 backport: removed the unittest part + +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index c5390371845..b5059a8a60e 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs") + endif() + ++# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded ++# by dlclose(). We need that since the CLI API relies on cross-references ++# between global objects which became horribly broken when one of the libraries ++# is unloaded. ++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete") ++endif() ++ + + function(append value) + foreach(variable ${ARGN}) +-- +2.15.1 + diff --git a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch new file mode 100644 index 000..21702748893 --- /dev/null +++ b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch @@ -0,0 +1,71 @@ +From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001 +From: Michal Gorny +Date: Mon, 27 Nov 2017 22:23:09 + +Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading + +Prevent unloading shared libraries on Linux when dlclose() is called. +This is necessary since command-line option parsing API relies on +registering the global option instances in the option parser instance +which can be loaded in a different shared library. + +Given that we can't reliably remove those options when a library is +unloaded, the parser ends up containing dangling references. Since glibc +has relatively complex library unloading rules, some of the LLVM +libraries can be unloaded while others (including the Support library) +stay loaded causing quite a mayhem. To reliably prevent that, just +forbid unloading all libraries -- it's a very bad idea anyway. + +While the issue arguably happens only with BUILD_SHARED_LIBS, it may +affect any library reusing llvm::cl
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.1/lldb/, sys-devel/llvm/files/3.9.1/compiler-rt/, ...
commit: 75f8d3f4c6e73272bb6d4be4273130a1955d187e Author: Michał Górny gentoo org> AuthorDate: Sat Jun 3 09:37:16 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 3 10:27:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f8d3f4 sys-devel/llvm: Move 3.9.1 patchset to tarball sys-devel/llvm/Manifest| 1 + ...ll-OCaml-modules-into-correct-package-loc.patch | 71 --- ...e-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 28 - ...rt-overriding-Sphinx-HTML-doc-install-dir.patch | 37 -- ...eparate-doctrees-to-prevent-races-between.patch | 35 - ...ake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch | 28 - ...roduce-ldconfig-compatible-SOVERSIONs-on-.patch | 62 -- ...PU-Fix-an-interaction-between-WQM-and-pol.patch | 120 ...clang-runtime-into-usr-lib-without-suffix.patch | 35 - ...make-Make-CLANG_LIBDIR_SUFFIX-overridable.patch | 28 - .../3.9.1/clang/darwin_prefix-include-paths.patch | 18 - .../llvm/files/3.9.1/clang/default-libs.patch | 703 - sys-devel/llvm/files/3.9.1/clang/gcc-config.patch | 422 - ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 25 - sys-devel/llvm/files/3.9.1/lldb/six.patch | 13 - sys-devel/llvm/files/3.9.1/llvm-config-r1.patch| 73 --- sys-devel/llvm/llvm-3.9.1-r1.ebuild| 37 +- 17 files changed, 20 insertions(+), 1716 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 88cc2b1dd23..f7b800f41b6 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -32,6 +32,7 @@ DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7 DIST llvm-3.8.1-patchset.tar.xz 24260 SHA256 4a1677b5aff3a4ca8ccdbcc45e286e44d23867cbaa48a39cffc0fc2a8765ed6c SHA512 1e4ec68c56cc72a89afb573ad0c3cada10be7ec02e0af033a6c5cf8ce46ed7bf40389543c2f1b11e7080dba49962c57b4ea9f9bc971c4647eb3fd945c0cf0529 WHIRLPOOL 38c16b23f995818a6ca292e89d28f85ae6d19327bc0efe72270611077a7b76bca99b2e1f11b8653550bddee4123f2611621b86c4b81cdb8f96edc1cd4c5cfc4f DIST llvm-3.8.1.src.tar.xz 16551472 SHA256 6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9 SHA512 99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366 WHIRLPOOL a99cef164a0e05e5237b840bee776d48fe0bde460cb4536f03a5e4eb0cc630deeb96f76bdd42f912a4b2dab08133bd9137ea16be1b9582d375f0f5841dd40234 DIST llvm-3.9.0_rc3-manpages.tar.bz2 80007 SHA256 991f5238d23c0aee2fd303d1adecd6045c42ed066f42f0d58f62c3a25c197140 SHA512 f96c340021de3f096ec3ad7d51a6af2c7a84974122d1df15729a39d4f9d65452f063a85ab38adb064288dc14220d9cc679b31ee19b48424d3d7cde621ff37597 WHIRLPOOL d3f24a2faaa5aa909519373532262c342acf517048ac543f303b6ddb539f5ece876a338c8efc445f4ada6f723a4e65e35bd5f2f9b4f52ef96ef832000259ab20 +DIST llvm-3.9.1-patchset.tar.xz 16404 SHA256 a4b3e5887b53af47984ea39ff8640f11e8a9accbafd1be20fb9cf25f2980b16c SHA512 dcae89ba910b5195bb455924242912f526b6994f0f236571b6364fd594bf9ca03cc74e116a44ae4372e34ce63b21f1351125157e7af7a957aee115f400b54089 WHIRLPOOL a9ec4315e8bb9593e6734e22a0d81fbe0398adedcfe7f6b81de852c1a1092593e07624a5ce7b67bca8be8b34c7453fda9f7eb33be41d11f51458800248a15649 DIST llvm-3.9.1.src.tar.xz 18130436 SHA256 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee SHA512 50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683 WHIRLPOOL 1cd1a25befcb178bec4a4aace4367167f3838d32edbe9db9de8c6e558c01c1fcf123f6d6f80b7ec9ff32b3d6dcf2de2f4eb4201d417c3d17a5c8a69934832903 DIST llvm-4.0.0.src.tar.xz 21016340 SHA256 8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be SHA512 cf681f0626ef6d568d951cdc3e143471a1d7715a0ba11e52aa273cf5d8d421e1357ef2645cc85879eaefcd577e99e74d07b01566825b3d0461171ef2cbfc7704 WHIRLPOOL 9783e8f47306c1deb2e114d4b46a7db9b0260b4965076345c88765413c5fc8e73fab5f88ae4903adbdea31406022948b16d32ae47d98f5def074509d5d794579 DIST llvm-manpages-4.0.0.tar.bz2 84861 SHA256 4676b3a18e95ddba19e868bfac0753154be2b57bc0d557f90270e4d2b0913d37 SHA512 7a04ffb607203aca099c816fe6e143779062610935f501786bd64bad6001741fb7a55adebe4e52e0611aa70fa04b22e1a7cab7b3da9dc2ed996fd0baf1ae8916 WHIRLPOOL e2ce15c26008995d71b830d74c5e6ca7dd862ed8208168facc0be6e7f855e5f59b143057ec2bbbaa70ed54dc77ad31279239886d25fe67c0853a9dee7baff31b diff --git a/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch deleted file mode 100644 index 367a8a7794f..000 --- a/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2907883b3c504a08b98cf735ceaa8e438d20f37e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Sun, 21 Aug 2016
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.7.1/compiler-rt/, sys-devel/llvm/files/3.7.1/clang/, ...
commit: 9fbbd3f25a352065041ab0a94b08785e00ef44bc Author: Michał Górny gentoo org> AuthorDate: Sat Jun 3 09:21:48 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 3 10:27:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbbd3f2 sys-devel/llvm: Move 3.7.1 patchset to tarball sys-devel/llvm/Manifest| 1 + ...clang-runtime-into-usr-lib-without-suffix.patch | 52 --- .../files/3.7.1/clang/ccc-analyzer-isystem.patch | 18 - .../llvm/files/3.7.1/clang/gentoo-install.patch| 48 --- .../files/3.7.1/compiler-rt/arm_march_flags.patch | 16 - .../llvm/files/3.7.1/compiler-rt/msan-fix.patch| 86 sys-devel/llvm/files/3.7.1/lldb/python.patch | 23 -- sys-devel/llvm/files/3.7.1/lldb/tinfo.patch| 12 - sys-devel/llvm/files/3.7.1/llvm-config-0.patch | 83 sys-devel/llvm/files/3.7.1/llvm-config-1.patch | 453 - sys-devel/llvm/files/3.7.1/llvm-config-2.patch | 113 - sys-devel/llvm/files/3.7.1/llvm-config-3.patch | 29 -- sys-devel/llvm/files/3.7.1/msan-fix.patch | 79 sys-devel/llvm/llvm-3.7.1-r3.ebuild| 47 +-- 14 files changed, 25 insertions(+), 1035 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index c10f9ba0cf1..e91c605e22e 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -26,6 +26,7 @@ DIST llvm-3.6.1-manpages.tar.bz2 38338 SHA256 b27c6198e09b11421841a7184d4e8a0f88 DIST llvm-3.6.2-patchset.tar.gz 4562 SHA256 7b85037d143732c0e635a2ba436d1f2418654161ecb5b9618f8e9ffad8fa3279 SHA512 6018e7d96317e6a46f373259430782a1377193ab64b337d5f6720a4ffe0eb0891e7e9373fb9c20da66e840f07e52f2bccb2a8c51bb55ded0f124748796cce1c8 WHIRLPOOL 01aeb3b454cc0d442c9a54ab3aca3be0106765f372ec4e82344f3967faa89fefec978562cdef56d1cc47cb418b0dd15ac685a2c1b05d415fb32b8684182aeb23 DIST llvm-3.6.2.src.tar.xz 12802380 SHA256 f60dc158bfda6822de167e87275848969f0558b3134892ff54fced87e4667b94 SHA512 42b44ce69cfb96e2dc12dc2246f0de8ff983a99741206e2c46ccf074b3248aaab9c0f22c6baad802de851d06f202f40db9dd62fe38aab4479b3f70026c936b36 WHIRLPOOL 1a15e16793fe4120f1c14a5334362c36db26745c493e7289281351b7c18c523d781ff9425dddfe1a2add9ea1e8aebb92f2313787da5f286259b55b0884b3039f DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643 WHIRLPOOL 743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358 +DIST llvm-3.7.1-patchset.tar.gz 17234 SHA256 3add3f23c0eae09f52ac055362234a116da4fc1e5a7772cd9a90519549e9f096 SHA512 030dc7f72d11fcd53307f707d5dde321054feb0f0977601c3e188a37f2be6c14bfd05482d1c1e5f435aaf32ca7c7e3701cf5f1375fbd0cf83cf8afbad7f4f6be WHIRLPOOL fa5d3464ac6315dabac895b753918b0dbe301ef6d8e45a75934ba6b0ba947e30763d0522bd95b79ae4a714b1234bb08e654c0a9987fd74e692eeb2afe16694e8 DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90 WHIRLPOOL 788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70 DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676 DIST llvm-3.8.1.src.tar.xz 16551472 SHA256 6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9 SHA512 99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366 WHIRLPOOL a99cef164a0e05e5237b840bee776d48fe0bde460cb4536f03a5e4eb0cc630deeb96f76bdd42f912a4b2dab08133bd9137ea16be1b9582d375f0f5841dd40234 diff --git a/sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch deleted file mode 100644 index 904a72a358a..000 --- a/sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b28503def986bcbc388a04be0d51cbe80bc59506 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Tue, 9 Jun 2015 12:11:50 +0200 -Subject: [PATCH] Install clang runtime into /usr/lib (without suffix) - - lib/Driver/Driver.cpp | 3 +-- - lib/Frontend/CompilerInvocation.cpp | 3
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/clang/, sys-devel/llvm/files/3.8.1/, ...
commit: 213b03205a77eae33b0ce31a8b176775125f8ab4 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 3 09:30:59 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 3 10:27:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213b0320 sys-devel/llvm: Move 3.8.1 patchset to tarball sys-devel/llvm/Manifest|1 + ...n-ordering-dep-between-HTML-man-Sphinx-ta.patch | 33 - .../3.8.1/0005-cmake-Do-not-install-libgtest.patch | 30 - ...ke-Restore-SOVERSIONs-on-shared-libraries.patch | 28 - .../3.8.1/clang/abi-tag-support-mangler.patch | 1230 .../files/3.8.1/clang/abi-tag-support-sema.patch | 419 --- .../llvm/files/3.8.1/clang/default-libs.patch | 106 -- .../files/3.8.1/clang/gcc4.9-search-path.patch | 70 -- .../clang/gentoo-runtime-gcc-detection-v3.patch| 42 - .../llvm/files/3.8.1/clang/musl-support.patch | 108 -- ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 25 - .../files/3.8.1/compiler-rt/arm_march_flags.patch | 17 - .../3.8.1/compiler-rt/darwin-default-sysroot.patch | 14 - sys-devel/llvm/files/3.8.1/compiler-rt/fbsd.patch | 20 - sys-devel/llvm/files/3.8.1/llvm-config.patch | 114 -- sys-devel/llvm/files/3.8.1/musl-env-support.patch | 164 --- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 51 +- 17 files changed, 27 insertions(+), 2445 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index e91c605e22e..88cc2b1dd23 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -29,6 +29,7 @@ DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aa DIST llvm-3.7.1-patchset.tar.gz 17234 SHA256 3add3f23c0eae09f52ac055362234a116da4fc1e5a7772cd9a90519549e9f096 SHA512 030dc7f72d11fcd53307f707d5dde321054feb0f0977601c3e188a37f2be6c14bfd05482d1c1e5f435aaf32ca7c7e3701cf5f1375fbd0cf83cf8afbad7f4f6be WHIRLPOOL fa5d3464ac6315dabac895b753918b0dbe301ef6d8e45a75934ba6b0ba947e30763d0522bd95b79ae4a714b1234bb08e654c0a9987fd74e692eeb2afe16694e8 DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90 WHIRLPOOL 788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70 DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676 +DIST llvm-3.8.1-patchset.tar.xz 24260 SHA256 4a1677b5aff3a4ca8ccdbcc45e286e44d23867cbaa48a39cffc0fc2a8765ed6c SHA512 1e4ec68c56cc72a89afb573ad0c3cada10be7ec02e0af033a6c5cf8ce46ed7bf40389543c2f1b11e7080dba49962c57b4ea9f9bc971c4647eb3fd945c0cf0529 WHIRLPOOL 38c16b23f995818a6ca292e89d28f85ae6d19327bc0efe72270611077a7b76bca99b2e1f11b8653550bddee4123f2611621b86c4b81cdb8f96edc1cd4c5cfc4f DIST llvm-3.8.1.src.tar.xz 16551472 SHA256 6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9 SHA512 99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366 WHIRLPOOL a99cef164a0e05e5237b840bee776d48fe0bde460cb4536f03a5e4eb0cc630deeb96f76bdd42f912a4b2dab08133bd9137ea16be1b9582d375f0f5841dd40234 DIST llvm-3.9.0_rc3-manpages.tar.bz2 80007 SHA256 991f5238d23c0aee2fd303d1adecd6045c42ed066f42f0d58f62c3a25c197140 SHA512 f96c340021de3f096ec3ad7d51a6af2c7a84974122d1df15729a39d4f9d65452f063a85ab38adb064288dc14220d9cc679b31ee19b48424d3d7cde621ff37597 WHIRLPOOL d3f24a2faaa5aa909519373532262c342acf517048ac543f303b6ddb539f5ece876a338c8efc445f4ada6f723a4e65e35bd5f2f9b4f52ef96ef832000259ab20 DIST llvm-3.9.1.src.tar.xz 18130436 SHA256 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee SHA512 50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683 WHIRLPOOL 1cd1a25befcb178bec4a4aace4367167f3838d32edbe9db9de8c6e558c01c1fcf123f6d6f80b7ec9ff32b3d6dcf2de2f4eb4201d417c3d17a5c8a69934832903 diff --git a/sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch deleted file mode 100644 index 94a81574d6e..000 --- a/sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Mon, 8 Jun
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/clang/, sys-devel/llvm/, ...
commit: 2b34de4f977e58d70e8e39e413f7f67d4fa906fb Author: Michał Górny gentoo org> AuthorDate: Wed May 24 15:57:30 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 3 08:27:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b34de4f sys-devel/llvm: Drop 3.9.0 (in favor of 3.9.1) Closes: https://github.com/gentoo/gentoo/pull/4739 sys-devel/llvm/Manifest| 5 - .../clang/gentoo-runtime-gcc-detection-v3.patch| 0 sys-devel/llvm/llvm-3.5.2-r100.ebuild | 2 +- sys-devel/llvm/llvm-3.6.2-r100.ebuild | 2 +- sys-devel/llvm/llvm-3.7.1-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-3.9.0-r1.ebuild| 539 - 7 files changed, 4 insertions(+), 548 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index f0b9db5c0e4..264b6063ef7 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -3,22 +3,18 @@ DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea32c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8 DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b DIST cfe-3.8.1.src.tar.xz 9605548 SHA256 4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf SHA512 72d23a410271b50f97371b13dd7a6c6c5c0a993e35df436ab716ece8521d83406aa3d4bf8fdecd8154139f39fd5e011e480d405225d8c3ff152d0a2ac4573e04 WHIRLPOOL 7bcc9e6fed871b7490e2a280f2ad36008150a0af3605357fbe529aea8a7acbbed41c7da273dd150f8f50869cd321f114e909236261c4dd05ed7f644c75f208c4 -DIST cfe-3.9.0.src.tar.xz 10390440 SHA256 7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28 SHA512 f405b5819fd19276b2de4da80a51171a3b1c5c00df810e1f284184c693e410775fe2933576f942b881664dd3b75e78f0f15b7e5a3eca7819ffbcfe528d9a578e WHIRLPOOL cb4ff4eaababa3017b4a96548b7fe1dc5f4926bd27dc6de56c3ae1fc450c8af1faf1edea2e909e40289477ebaf79860fca3a9695b22402dc9385031d7b8ad5bf DIST cfe-3.9.1.src.tar.xz 10363080 SHA256 e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63 SHA512 3f0eea194597e438bbe49ce9ef5fdced81459c21cbdd2653750b2fe02c55a0154d6a33a8cfd02e607b83314a8e35b2c300f944462120ab6de1d4139d85db56b8 WHIRLPOOL 9f70688c7c2857426bf5fbf039b9723ec73ec57e8d3b36da37589bcbdbdb090aa36cd1800f0521ef0c30065bf03083eade0ac81ef0939412919423db7779a6f8 DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb DIST clang-tools-extra-3.8.1.src.tar.xz 334768 SHA256 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396 SHA512 ec8c4a6ac4fd1a0e24fc15e56ba00828e0d718c2f7bd477ea134ab094c67f4f4b2f603f128ec11a03b7f25f3e9b8fe75181e40730c56b7b683f54e3f37573137 WHIRLPOOL b05213cbe21b778e718233cecbf4d01b92c1f133eced6fdd3fa5059c4b10e5f0407549634f65032af177ba1614250f5c02e283c2b03563db3e227b1afcae424b -DIST clang-tools-extra-3.9.0.src.tar.xz 455144 SHA256 5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14 SHA512 7d5f8d3b44e45022db65434f4d141f23706edf6aa9f3c28ded43e84e85c7c4878ffe98bf15f71e4c71fd176dfc49ce5180892d710bc5eccf95de1ed12f3c8074 WHIRLPOOL 44863889eaa33face00b9644f5c1465446bec39f88bc5ea32835dfa091a83161e292c2b3bcdcccb7cb34cdc3f1970bb3bbfbf6918c425b11a1465bedc3e0611f DIST clang-tools-extra-3.9.1.src.tar.xz 456464 SHA256 29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635 SHA512 5691fb09f80b519876cdd2e82ad23a20bba32a0bc356e15e6db631b2936763911f15ff55f8bf5f073100b9e4cf217f08fdce90ae98ef0e084274259d3cfe9634 WHIRLPOOL 1b1d877da04a2d8f93e3181b9b32caad23874a052c1e29bc66fddf29efb8edd69979400fcff40de00831d041383356fe7c37ddd63de8a206498baa65f7b79872 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
commit: 64f076a7aa3f7387f827d898481d8fff856bd370 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 11 11:53:50 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Feb 11 12:07:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f076a7 sys-devel/llvm: Remove CMAKE_BUILD_TYPE hack from llvm-config in 4.0+ ...nfig-Clean-up-exported-values-update-for-shar.patch | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch index 32213040a8..5def55d38f 100644 --- a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch @@ -6,18 +6,12 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared Gentoo-specific fixup for llvm-config, including: - wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- making --src-root return invalid path (/dev/null), -- making --build-mode return "Release" rather than "Gentoo". +- making --src-root return invalid path (/dev/null). Thanks to Steven Newbury for the initial patch. Bug: https://bugs.gentoo.org/565358 Bug: https://bugs.gentoo.org/501684 - tools/llvm-config/CMakeLists.txt | 11 --- - tools/llvm-config/llvm-config.cpp | 9 +++-- - 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 744fa4e44d1..593788aaef3 100644 @@ -42,16 +36,6 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c index d780094861c..c61c72ff48c 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -531,7 +531,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--host-target") { - OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; - } else if (Arg == "--build-mode") { --OS << build_mode << '\n'; -+// force Release since we force non-standard Gentoo build mode -+OS << "Release" << '\n'; - } else if (Arg == "--assertion-mode") { - #if defined(NDEBUG) - OS << "OFF\n"; @@ -549,7 +550,11 @@ int main(int argc, char **argv) { } else if (Arg == "--obj-root") { OS << ActivePrefix << '\n';
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/, sys-devel/llvm/, sys-devel/llvm/files/3.9.1/
commit: d36d66e6d8f8da372bc8b6dc23b69a69c8b84960 Author: Michał Górny gentoo org> AuthorDate: Mon Jan 23 08:28:47 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 23 08:38:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36d66e6 sys-devel/llvm: Backport upstream Sphinx race fix to 3.9, #606858 It seems that we have only applied the patch fixing race condition between LLVM Sphinx targets and not between clang's. To fix that, just switch to the upstream patch that fixes both at the root. ...n-ordering-dep-between-HTML-man-Sphinx-ta.patch | 0 ...eparate-doctrees-to-prevent-races-between.patch | 35 ++ sys-devel/llvm/llvm-3.7.1-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- sys-devel/llvm/llvm-3.9.0-r1.ebuild| 2 +- sys-devel/llvm/llvm-3.9.1-r1.ebuild| 2 +- sys-devel/llvm/llvm-3.9.1.ebuild | 2 +- 8 files changed, 41 insertions(+), 6 deletions(-) diff --git a/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch similarity index 100% rename from sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch rename to sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch diff --git a/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch b/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch new file mode 100644 index ..1e01e64 --- /dev/null +++ b/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch @@ -0,0 +1,35 @@ +From 40960f63616f62c8ac52eeeddf68bdb441b8be3e Mon Sep 17 00:00:00 2001 +From: Michal Gorny+Date: Tue, 4 Oct 2016 06:09:14 + +Subject: [PATCH] [cmake] Use separate doctrees to prevent races between Sphinx + instances + +Use separate doctrees between different Sphinx builders in order to +prevent race condition issues due to multiple Sphinx instances accessing +the same doctree cache in parallel. + +Bug: https://llvm.org/bugs/show_bug.cgi?id=23781 + +Differential Revision: https://reviews.llvm.org/D23755 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283188 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + cmake/modules/AddSphinxTarget.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index a968555aa06..ca9f4c38ffd 100644 +--- a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +@@ -6,7 +6,7 @@ + # ``project`` should be the project name + function (add_sphinx_target builder project) + set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${builder}") +- set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees") ++ set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-${builder}") + set(SPHINX_TARGET_NAME docs-${project}-${builder}) + + if (SPHINX_WARNINGS_AS_ERRORS) +-- +2.11.0 + diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index b1e9ceb..edebcba 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -167,7 +167,7 @@ src_prepare() { # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch + eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index 5ba7822..fd640fc 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -167,7 +167,7 @@ src_prepare() { # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch + eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index dcc8353..86a8fe9 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -168,7 +168,7 @@ src_prepare() { # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.1/, sys-devel/llvm/
commit: adcf096fb28450ee4326e38110fab081b0969368 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 21 11:37:46 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Jan 21 13:03:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcf096f sys-devel/llvm: Revert upstream AMDGPU breakage, #603858 ...PU-Fix-an-interaction-between-WQM-and-pol.patch | 120 + sys-devel/llvm/llvm-3.9.1-r1.ebuild| 551 + 2 files changed, 671 insertions(+) diff --git a/sys-devel/llvm/files/3.9.1/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch b/sys-devel/llvm/files/3.9.1/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch new file mode 100644 index ..f9ec68c --- /dev/null +++ b/sys-devel/llvm/files/3.9.1/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch @@ -0,0 +1,120 @@ +From d6b5bd6f44e8091a4c4870f1c52921c25a4f8cca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Sat, 21 Jan 2017 12:35:36 +0100 +Subject: [PATCH] Revert "AMDGPU: Fix an interaction between WQM and polygon + stippling" + +https://bugs.gentoo.org/603858 +--- + lib/Target/AMDGPU/SIInstructions.td | 1 - + lib/Target/AMDGPU/SIWholeQuadMode.cpp | 7 + + test/CodeGen/AMDGPU/wqm.ll| 49 +++ + 3 files changed, 11 insertions(+), 46 deletions(-) + +diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td +index dde5f2fc6b4..18b7d5d62ef 100644 +--- a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td +@@ -2029,7 +2029,6 @@ def SI_RETURN : PseudoInstSI < + let hasSideEffects = 1; + let SALU = 1; + let hasNoSchedulingInfo = 1; +- let DisableWQM = 1; + } + + let Uses = [EXEC], Defs = [EXEC, VCC, M0], +diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +index 1534d582569..b200c153df0 100644 +--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +@@ -219,6 +219,13 @@ char SIWholeQuadMode::scanInstructions(MachineFunction , + markInstruction(MI, Flags, Worklist); + GlobalFlags |= Flags; + } ++ ++if (WQMOutputs && MBB.succ_empty()) { ++ // This is a prolog shader. Make sure we go back to exact mode at the end. ++ Blocks[].OutNeeds = StateExact; ++ Worklist.push_back(); ++ GlobalFlags |= StateExact; ++} + } + + return GlobalFlags; +diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll +index 41e42645788..809a7ba9b82 100644 +--- a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll +@@ -17,18 +17,17 @@ main_body: + ;CHECK-LABEL: {{^}}test2: + ;CHECK-NEXT: ; %main_body + ;CHECK-NEXT: s_wqm_b64 exec, exec ++;CHECK: image_sample + ;CHECK-NOT: exec +-define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { ++;CHECK: _load_dword v0, ++define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { + main_body: + %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) + %c.2 = bitcast <4 x float> %c.1 to <4 x i32> + %c.3 = extractelement <4 x i32> %c.2, i32 0 + %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3 + %data = load float, float addrspace(1)* %gep +- +- call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef) +- +- ret void ++ ret float %data + } + + ; ... but disabled for stores (and, in this simple case, not re-enabled). +@@ -415,46 +414,6 @@ entry: + ret void + } + +-; Must return to exact at the end of a non-void returning shader, +-; otherwise the EXEC mask exported by the epilog will be wrong. This is true +-; even if the shader has no kills, because a kill could have happened in a +-; previous shader fragment. +-; +-; CHECK-LABEL: {{^}}test_nonvoid_return: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind { +- %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- %tex.i = bitcast <4 x float> %tex to <4 x i32> +- %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- ret <4 x float> %dtex +-} +- +-; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
commit: 7bb6bfaffcd296db204e5ffc686d5cad1c0d5262 Author: Michał Górny gentoo org> AuthorDate: Wed Jan 11 17:09:55 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed Jan 11 19:12:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb6bfaf sys-devel/llvm: Update llvm-config patch for - Remove the system-libs bits from the llvm-config patch since they are no longer necessary now that 'llvm-config --system-libs' does not output any libraries when using shared linking. ...llvm-config-Clean-up-exported-values-update-for-shar.patch | 11 --- 1 file changed, 11 deletions(-) diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch index 5a5bb0a..3221304 100644 --- a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch @@ -7,7 +7,6 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared Gentoo-specific fixup for llvm-config, including: - wiping build-specific CFLAGS, CXXFLAGS, - updating library suffixes for shared libs, -- wiping --system-libs for shared linking, - making --src-root return invalid path (/dev/null), - making --build-mode return "Release" rather than "Gentoo". @@ -39,16 +38,6 @@ index 744fa4e44d1..593788aaef3 100644 set(LLVM_BUILD_SYSTEM cmake) set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}") -@@ -46,7 +50,8 @@ endif() - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index d780094861c..c61c72ff48c 100644 --- a/tools/llvm-config/llvm-config.cpp
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.1/clang/, sys-devel/llvm/
commit: e38485f5bf6e92cdc7c0109a07f3955821baa951 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 21 16:03:17 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Dec 21 21:01:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38485f5 sys-devel/llvm: Bump to 3.9.1, backport gcc-config fixes Bump to 3.9.1 bugfix release, and backport full set of gcc-config fixes from trunk. The latter includes fixing cross-compilation support, proper multilib gcc support and appropriate Gentoo tests. sys-devel/llvm/Manifest | 5 + sys-devel/llvm/files/3.9.1/clang/gcc-config.patch | 422 + sys-devel/llvm/llvm-3.9.1.ebuild | 547 ++ 3 files changed, 974 insertions(+) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index cebff1d..57252b5 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -4,20 +4,24 @@ DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b DIST cfe-3.8.1.src.tar.xz 9605548 SHA256 4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf SHA512 72d23a410271b50f97371b13dd7a6c6c5c0a993e35df436ab716ece8521d83406aa3d4bf8fdecd8154139f39fd5e011e480d405225d8c3ff152d0a2ac4573e04 WHIRLPOOL 7bcc9e6fed871b7490e2a280f2ad36008150a0af3605357fbe529aea8a7acbbed41c7da273dd150f8f50869cd321f114e909236261c4dd05ed7f644c75f208c4 DIST cfe-3.9.0.src.tar.xz 10390440 SHA256 7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28 SHA512 f405b5819fd19276b2de4da80a51171a3b1c5c00df810e1f284184c693e410775fe2933576f942b881664dd3b75e78f0f15b7e5a3eca7819ffbcfe528d9a578e WHIRLPOOL cb4ff4eaababa3017b4a96548b7fe1dc5f4926bd27dc6de56c3ae1fc450c8af1faf1edea2e909e40289477ebaf79860fca3a9695b22402dc9385031d7b8ad5bf +DIST cfe-3.9.1.src.tar.xz 10363080 SHA256 e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63 SHA512 3f0eea194597e438bbe49ce9ef5fdced81459c21cbdd2653750b2fe02c55a0154d6a33a8cfd02e607b83314a8e35b2c300f944462120ab6de1d4139d85db56b8 WHIRLPOOL 9f70688c7c2857426bf5fbf039b9723ec73ec57e8d3b36da37589bcbdbdb090aa36cd1800f0521ef0c30065bf03083eade0ac81ef0939412919423db7779a6f8 DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512 6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669 WHIRLPOOL 088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512 1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a WHIRLPOOL 3dcc302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb DIST clang-tools-extra-3.8.1.src.tar.xz 334768 SHA256 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396 SHA512 ec8c4a6ac4fd1a0e24fc15e56ba00828e0d718c2f7bd477ea134ab094c67f4f4b2f603f128ec11a03b7f25f3e9b8fe75181e40730c56b7b683f54e3f37573137 WHIRLPOOL b05213cbe21b778e718233cecbf4d01b92c1f133eced6fdd3fa5059c4b10e5f0407549634f65032af177ba1614250f5c02e283c2b03563db3e227b1afcae424b DIST clang-tools-extra-3.9.0.src.tar.xz 455144 SHA256 5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14 SHA512 7d5f8d3b44e45022db65434f4d141f23706edf6aa9f3c28ded43e84e85c7c4878ffe98bf15f71e4c71fd176dfc49ce5180892d710bc5eccf95de1ed12f3c8074 WHIRLPOOL 44863889eaa33face00b9644f5c1465446bec39f88bc5ea32835dfa091a83161e292c2b3bcdcccb7cb34cdc3f1970bb3bbfbf6918c425b11a1465bedc3e0611f +DIST clang-tools-extra-3.9.1.src.tar.xz 456464 SHA256 29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635 SHA512 5691fb09f80b519876cdd2e82ad23a20bba32a0bc356e15e6db631b2936763911f15ff55f8bf5f073100b9e4cf217f08fdce90ae98ef0e084274259d3cfe9634 WHIRLPOOL 1b1d877da04a2d8f93e3181b9b32caad23874a052c1e29bc66fddf29efb8edd69979400fcff40de00831d041383356fe7c37ddd63de8a206498baa65f7b79872 DIST
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
commit: 156b9ad0a4e9f225e8c5ea36fa6bf740d2e1c60a Author: Michał Górny gentoo org> AuthorDate: Wed Dec 14 22:05:25 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Dec 14 22:13:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156b9ad0 sys-devel/llvm: Rebase the llvm-config patch for - ...ig-Clean-up-exported-values-update-for-shar.patch | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch index 0ae66bd..5a5bb0a 100644 --- a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch @@ -1,7 +1,7 @@ -From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e Mon Sep 17 00:00:00 2001 +From 628b899be14a6bab4b32dbd53aabd447dcc16cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=Date: Sat, 20 Aug 2016 23:47:41 +0200 -Subject: [PATCH 6/9] llvm-config: Clean up exported values, update for shared +Subject: [PATCH] llvm-config: Clean up exported values, update for shared linking Gentoo-specific fixup for llvm-config, including: @@ -21,7 +21,7 @@ Bug: https://bugs.gentoo.org/501684 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 744fa4e..593788a 100644 +index 744fa4e44d1..593788aaef3 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) @@ -50,10 +50,10 @@ index 744fa4e..593788a 100644 set(LLVM_ENABLE_SHARED ON) else() diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index c63733f..3162091 100644 +index d780094861c..c61c72ff48c 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -522,7 +522,8 @@ int main(int argc, char **argv) { +@@ -531,7 +531,8 @@ int main(int argc, char **argv) { } else if (Arg == "--host-target") { OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; } else if (Arg == "--build-mode") { @@ -63,7 +63,7 @@ index c63733f..3162091 100644 } else if (Arg == "--assertion-mode") { #if defined(NDEBUG) OS << "OFF\n"; -@@ -540,7 +541,11 @@ int main(int argc, char **argv) { +@@ -549,7 +550,11 @@ int main(int argc, char **argv) { } else if (Arg == "--obj-root") { OS << ActivePrefix << '\n'; } else if (Arg == "--src-root") { @@ -73,9 +73,9 @@ index c63733f..3162091 100644 +} else { + OS << "/dev/null\n"; +} - } else if (Arg == "--link-shared") { - LinkMode = LinkModeShared; - } else if (Arg == "--link-static") { + } else if (Arg == "--ignore-libllvm") { + LinkDyLib = false; + LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto; -- -2.9.3 +2.11.0
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/, sys-devel/llvm/files/9999/, sys-devel/llvm/, ...
commit: ac51d7f887476d9f6b83b7a35f9ea10cd06a4c7d Author: Michał Górny gentoo org> AuthorDate: Tue Oct 4 06:39:01 2016 + Commit: Michał Górny gentoo org> CommitDate: Tue Oct 4 06:41:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac51d7f8 sys-devel/llvm: SOVERSIONs have been fixed upst, backport new to 3.9.0 ...ke-Restore-SOVERSIONs-on-shared-libraries.patch | 0 ...roduce-ldconfig-compatible-SOVERSIONs-on-.patch | 62 ++ sys-devel/llvm/llvm-3.8.0-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- sys-devel/llvm/llvm-3.9.0.ebuild | 2 +- sys-devel/llvm/llvm-.ebuild| 4 -- 7 files changed, 66 insertions(+), 8 deletions(-) diff --git a/sys-devel/llvm/files//0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch b/sys-devel/llvm/files/3.8.1/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch similarity index 100% rename from sys-devel/llvm/files//0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch rename to sys-devel/llvm/files/3.8.1/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch diff --git a/sys-devel/llvm/files/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch b/sys-devel/llvm/files/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch new file mode 100644 index ..6634cde --- /dev/null +++ b/sys-devel/llvm/files/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch @@ -0,0 +1,62 @@ +From aeddc35a35c55f487977d7609060225e03e2028b Mon Sep 17 00:00:00 2001 +From: Michal Gorny+Date: Tue, 4 Oct 2016 06:09:18 + +Subject: [PATCH] [cmake] Reintroduce (ldconfig-compatible) SOVERSIONs on + shared libraries + +Reintroduce versioning of shared libraries via SOVERSION, addressing +the issues with the previous design, since Gentoo is relying +on shared-split install of LLVM. The SOVERSIONs were originally +introduced in r229720 for all libraries, and removed in r252093 in favor +of custom SONAME. As far as I understand, the major concern with the old +versioning was that the used versions were incompatible with ldconfig. + +Having considered that, this commit introduce SOVERSIONS with the +following considerations: + +1. SOVERSIONs are formed of major & minor version concatenated -- i.e. +for 4.0 its .so.40. This matches the common practice where the first +version number indicates ABI breakage, and therefore fixes the issues +with ldconfig. Additionally, VERSION with the remaining verion +components appended is used, however this is not strictly necessary. + +2. The versioning is only applied to libraries with no explicit SONAME +specified -- i.e. it won't apply to libLLVM but only to the split +libraries. It will also apply to libraries installed by the subprojects. + +3. The versioning is only done on *nix systems, Darwin excluded. This +matches the current use of SONAME. + +Differential Revision: https://reviews.llvm.org/D24757 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283189 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + cmake/modules/AddLLVM.cmake | 12 + 1 file changed, 12 insertions(+) + +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 37b3b80..7cb1b0c 100644 +--- a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +@@ -450,6 +450,18 @@ function(llvm_add_library name) + PREFIX "" + ) + endif() ++ ++# Set SOVERSION on shared libraries that lack explicit SONAME ++# specifier, on *nix systems that are not Darwin. ++if(UNIX AND NOT APPLE AND NOT ARG_SONAME) ++ set_target_properties(${name} ++PROPERTIES ++ # Concatenate the version numbers since ldconfig expects exactly ++ # one component indicating the ABI version, while LLVM uses ++ # major+minor for that. ++SOVERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR} ++VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) ++endif() + endif() + + if(ARG_MODULE OR ARG_SHARED) +-- +2.10.0 + diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index b08f4d6..e457200 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -167,7 +167,7 @@ src_prepare() { # Restore SOVERSIONs for shared libraries # https://bugs.gentoo.org/show_bug.cgi?id=578392 - eapply "${FILESDIR}"//0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch + eapply "${FILESDIR}"/3.8.1/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.0/, sys-devel/llvm/files/9999/, sys-devel/llvm/
commit: 50136b87a1488e6753dcda89398152a515913409 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 30 18:45:49 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 30 18:47:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50136b87 sys-devel/llvm: OCaml install path patch has been merged upstream .../0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch| 0 sys-devel/llvm/llvm-3.7.1-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.0-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- sys-devel/llvm/llvm-3.9.0.ebuild | 2 +- sys-devel/llvm/llvm-.ebuild| 3 --- 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys-devel/llvm/files//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch similarity index 100% rename from sys-devel/llvm/files//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch rename to sys-devel/llvm/files/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index ef041e6..5b80975 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -141,7 +141,7 @@ src_prepare() { # Make ocaml warnings non-fatal, bug #537308 sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch + eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index 773c353..7731a4b 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -142,7 +142,7 @@ src_prepare() { # Make ocaml warnings non-fatal, bug #537308 sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch + eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index f0bb43b..f16aca4 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -143,7 +143,7 @@ src_prepare() { # Make ocaml warnings non-fatal, bug #537308 sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch + eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index 2e81b58..036de49 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -142,7 +142,7 @@ src_prepare() { # Make ocaml warnings non-fatal, bug #537308 sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch + eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild index 454f997..a5269d3 100644 --- a/sys-devel/llvm/llvm-3.9.0.ebuild +++ b/sys-devel/llvm/llvm-3.9.0.ebuild @@ -151,7 +151,7 @@ src_prepare() { python_setup # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch + eapply
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.0/, sys-devel/llvm/files/9999/, sys-devel/llvm/
commit: c24c55e7dff5ab533dad612e9714b6bc675b5484 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 23 11:27:58 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 23 11:28:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24c55e7 sys-devel/llvm: Move the old Sphinx install patch to <=3.9.0 .../0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch | 0 sys-devel/llvm/llvm-3.7.1-r3.ebuild | 2 +- sys-devel/llvm/llvm-3.8.0-r3.ebuild | 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +- sys-devel/llvm/llvm-3.8.1.ebuild| 2 +- sys-devel/llvm/llvm-3.9.0.ebuild| 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-devel/llvm/files//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch similarity index 100% rename from sys-devel/llvm/files//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch rename to sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index b8805b0..ef041e6 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -147,7 +147,7 @@ src_prepare() { # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch + eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index 111706a..773c353 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -148,7 +148,7 @@ src_prepare() { # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch + eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index 14a2e82..f0bb43b 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -149,7 +149,7 @@ src_prepare() { # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch + eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index 81d3f0f..2e81b58 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -148,7 +148,7 @@ src_prepare() { # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch + eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781 diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild index ae3d205..c9f2b86 100644 --- a/sys-devel/llvm/llvm-3.9.0.ebuild +++ b/sys-devel/llvm/llvm-3.9.0.ebuild @@ -150,7 +150,7 @@ src_prepare() { # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"//0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch + eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch # Prevent race conditions with parallel Sphinx runs # https://llvm.org/bugs/show_bug.cgi?id=23781
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/, sys-devel/llvm/files/3.4.2/, ...
commit: 2a73d6a0d8612d1d396b0bf436a0ed9d9affb25c Author: Fabian Groffen gentoo org> AuthorDate: Sat Sep 10 15:20:26 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Sep 10 15:20:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a73d6a0 sys-devel/llvm: fix patches for 3.4.2 Package-Manager: portage-2.2.28 .../clang/darwin_build_fix.patch}| 0 .../clang/gentoo-install.patch} | 0 .../clang/gentoo-runtime-gcc-detection-v3.patch} | 0 .../gentoo-install.patch}| 0 sys-devel/llvm/llvm-3.4.2-r100.ebuild| 12 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch similarity index 100% rename from sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch rename to sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch diff --git a/sys-devel/llvm/files/clang-3.4-gentoo-install.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch similarity index 100% rename from sys-devel/llvm/files/clang-3.4-gentoo-install.patch rename to sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch diff --git a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch similarity index 100% rename from sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch rename to sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/3.4.2/gentoo-install.patch similarity index 100% rename from sys-devel/llvm/files/llvm-3.4-gentoo-install.patch rename to sys-devel/llvm/files/3.4.2/gentoo-install.patch diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild index 5e73596..0f5e951 100644 --- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild +++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild @@ -84,16 +84,16 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch - epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch + epatch "${FILESDIR}"/3.6.2/nodoctargz.patch + epatch "${FILESDIR}"/3.4.2/gentoo-install.patch if use clang; then # Automatically select active system GCC's libraries, bugs #406163 and #417913 - epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch + epatch "${FILESDIR}"/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch - epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch - epatch "${FILESDIR}"/clang-3.4-darwin_build_fix.patch - epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch + epatch "${FILESDIR}"/3.4.2/clang/gentoo-install.patch + epatch "${FILESDIR}"/3.4.2/clang/darwin_build_fix.patch + epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp fi
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 29727ce6e434d8265350bbe7d1c47b13d17eb192 Author: Fabian Groffen gentoo org> AuthorDate: Sat Sep 10 08:43:12 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Sep 10 08:43:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29727ce6 sys-devel/llvm: restore llvm-3.4.2 for Prefix bootstraps, bug #588132 Package-Manager: portage-2.2.28 sys-devel/llvm/Manifest| 4 + ...clang-3.1-gentoo-runtime-gcc-detection-v3.patch | 29 +++ .../llvm/files/clang-3.4-darwin_build_fix.patch| 47 .../llvm/files/clang-3.4-gentoo-install.patch | 80 +++ sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 96 sys-devel/llvm/llvm-3.4.2-r100.ebuild | 245 + 6 files changed, 501 insertions(+) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 239bf72..37b5d6f 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,3 +1,4 @@ +DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7 DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620 SHA512 2ad9a7daa8e62cdbf47b001aa6b937a06ae7e6396dcd1832797e2d98036522443ccfca9f1253e16d531a99d1edf237fcd2b457c55491ff68ca4534a2396ca52f WHIRLPOOL 51789ba2a3193d404b26d26b999fc47f1bc4b56b45048078cc51e4ff5c31d834d360ee0c2d16096c060f85acab6de9055dc375569348ae3307e4b280406f2d9e DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea32c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8 @@ -12,6 +13,7 @@ DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a8 DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e6bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9 DIST clang-tools-extra-3.8.1.src.tar.xz 334768 SHA256 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396 SHA512 ec8c4a6ac4fd1a0e24fc15e56ba00828e0d718c2f7bd477ea134ab094c67f4f4b2f603f128ec11a03b7f25f3e9b8fe75181e40730c56b7b683f54e3f37573137 WHIRLPOOL b05213cbe21b778e718233cecbf4d01b92c1f133eced6fdd3fa5059c4b10e5f0407549634f65032af177ba1614250f5c02e283c2b03563db3e227b1afcae424b DIST clang-tools-extra-3.9.0.src.tar.xz 455144 SHA256 5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14 SHA512 7d5f8d3b44e45022db65434f4d141f23706edf6aa9f3c28ded43e84e85c7c4878ffe98bf15f71e4c71fd176dfc49ce5180892d710bc5eccf95de1ed12f3c8074 WHIRLPOOL 44863889eaa33face00b9644f5c1465446bec39f88bc5ea32835dfa091a83161e292c2b3bcdcccb7cb34cdc3f1970bb3bbfbf6918c425b11a1465bedc3e0611f +DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2 DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256 542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3 SHA512 319a8a1dbe07eb4f1fcccfe79a1fa445f348fb854a441500e89fa0a128e45716b65d06347f19a63de32e9294cd2331e914ae0d5fe8224f0b2452c39b79ac96ff WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/compiler-rt/, sys-devel/llvm/
commit: 159c9d730cdd4ed188ef9aa4ad9a36e322461ce2 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 4 15:03:09 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 4 15:04:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159c9d73 sys-devel/llvm: add patch for compiler-rt on Darwin/Prefix Package-Manager: portage-2.2.28 .../files/3.8.1/compiler-rt/darwin-default-sysroot.patch | 14 ++ sys-devel/llvm/llvm-3.8.1.ebuild | 2 ++ sys-devel/llvm/llvm-3.9.0.ebuild | 2 ++ 3 files changed, 18 insertions(+) diff --git a/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch new file mode 100644 index ..9122ce9 --- /dev/null +++ b/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch @@ -0,0 +1,14 @@ +find_darwin_sdk_dir: fall back to / for sysroot + +--- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -17,6 +17,9 @@ + ERROR_FILE /dev/null + ) + endif() ++ if("" STREQUAL "${var_internal}") ++set(var_internal "/") ++ endif() + set(${var} ${var_internal} PARENT_SCOPE) + endfunction() + diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index cc390c5..8734298 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -185,6 +185,8 @@ src_prepare() { eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp + + eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ tools/clang/tools/scan-build/bin/scan-build || die diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild index 3752c6d..9fde6d4 100644 --- a/sys-devel/llvm/llvm-3.9.0.ebuild +++ b/sys-devel/llvm/llvm-3.9.0.ebuild @@ -181,6 +181,8 @@ src_prepare() { eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp + + eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch pushd "${S}"/tools/clang >/dev/null || die # be able to specify default values for -stdlib and -rtlib at build time
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/, sys-devel/llvm/
commit: a1621d0c04dd6ddc4b5e4ebcef40501289292470 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 2 20:45:36 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 2 21:40:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1621d0c sys-devel/llvm: Stop installing llvm-lit Stop installing lit as llvm-lit since the correct install layout is still unclear (wrt https://reviews.llvm.org/D23743), installed version search is inconsistent and broken, and all reverse dependencies require LLVM source checkout anyway and therefore use the internal lit package included in it. The install will eventually be addressed later, most likely as a split package. ...ystem-llvm-lit-when-lit.py-does-not-exist.patch | 33 -- ...y-Install-as-llvm-lit-as-cmake-expects-it.patch | 30 sys-devel/llvm/llvm-.ebuild| 25 3 files changed, 5 insertions(+), 83 deletions(-) diff --git a/sys-devel/llvm/files//0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch b/sys-devel/llvm/files//0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch deleted file mode 100644 index 7245af0.. --- a/sys-devel/llvm/files//0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bcdf2c49b7686046f8a9a5664f0e46117997baf4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Sun, 21 Aug 2016 23:19:40 +0200 -Subject: [PATCH 09/10] cmake: Use system llvm-lit when lit.py does not exist - in srcdir - -Modify the add_lit_target function to use lit.py from LLVM_MAIN_SRC_DIR -only when one does exist there, and otherwise fall back to looking for -system install of llvm-lit. This is based on a similar conditional in -clang's CMakeLists.txt, and makes it possible to run clang's tests when -built separately from LLVM with no access to the original sources. - -Patch: https://reviews.llvm.org/D23742 - cmake/modules/AddLLVM.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 83a2359..87540d5 100644 a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -1081,7 +1081,7 @@ function(add_lit_target target comment) - if (NOT CMAKE_CFG_INTDIR STREQUAL ".") - list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR}) - endif () -- if (LLVM_MAIN_SRC_DIR) -+ if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) - set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) - else() - find_program(LIT_COMMAND llvm-lit) --- -2.9.3 - diff --git a/sys-devel/llvm/files//0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch b/sys-devel/llvm/files//0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch deleted file mode 100644 index 53726aa.. --- a/sys-devel/llvm/files//0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 242fd2cbad1075d4cc0e3a3b64652dbc766bd117 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 21 Aug 2016 23:20:11 +0200 -Subject: [PATCH 10/10] lit/setup.py: Install as llvm-lit (as cmake expects it) - -Modify the setup.py for lit to install the entry point as llvm-lit -(instead of lit) since this is the name expected by functions in -AddLLVM.cmake. - -Patch: https://reviews.llvm.org/D23743 - utils/lit/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/lit/setup.py b/utils/lit/setup.py -index 10de6bb..c57e0aa 100644 a/utils/lit/setup.py -+++ b/utils/lit/setup.py -@@ -71,7 +71,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit. - packages = find_packages(), - entry_points = { - 'console_scripts': [ --'lit = lit:main', -+'llvm-lit = lit:main', - ], - } - ) --- -2.9.3 - diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild index 6fbe8c8..2f4485f 100644 --- a/sys-devel/llvm/llvm-.ebuild +++ b/sys-devel/llvm/llvm-.ebuild @@ -7,11 +7,10 @@ EAPI=6 : ${CMAKE_MAKEFILE_GENERATOR:=ninja} # (needed due to lib32 find_library fix) CMAKE_MIN_VERSION=3.6.1-r1 -DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils distutils-r1 flag-o-matic git-r3 \ - multilib-minimal pax-utils toolchain-funcs +inherit check-reqs cmake-utils flag-o-matic git-r3 \ + multilib-minimal pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="http://llvm.org/; @@ -25,7 +24,6 @@ KEYWORDS="" IUSE="debug +doc gold libedit +libffi multitarget ncurses ocaml test video_cards_radeon elibc_musl kernel_Darwin" -# python is needed for llvm-lit (which is installed) RDEPEND=" sys-libs/zlib:0= gold? (
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
commit: 99e47f0307cf265b96d7a428b443d98f50e789cf Author: Michał Górny gentoo org> AuthorDate: Wed Aug 31 15:54:20 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 31 21:11:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e47f03 sys-devel/llvm: Fix llvm-config --obj-root on the live ebuild ...-Clean-up-exported-values-update-for-shar.patch | 25 -- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch index 968db45..0ae66bd 100644 --- a/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch +++ b/sys-devel/llvm/files//0007-llvm-config-Clean-up-exported-values-update-for-shar.patch @@ -1,14 +1,14 @@ -From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001 +From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=Date: Sat, 20 Aug 2016 23:47:41 +0200 -Subject: [PATCH 07/10] llvm-config: Clean up exported values, update for - shared linking +Subject: [PATCH 6/9] llvm-config: Clean up exported values, update for shared + linking Gentoo-specific fixup for llvm-config, including: - wiping build-specific CFLAGS, CXXFLAGS, - updating library suffixes for shared libs, - wiping --system-libs for shared linking, -- making --obj-root and --src-root return invalid path (/dev/null), +- making --src-root return invalid path (/dev/null), - making --build-mode return "Release" rather than "Gentoo". Thanks to Steven Newbury for the initial patch. @@ -17,8 +17,8 @@ Bug: https://bugs.gentoo.org/565358 Bug: https://bugs.gentoo.org/501684 --- tools/llvm-config/CMakeLists.txt | 11 --- - tools/llvm-config/llvm-config.cpp | 15 --- - 2 files changed, 20 insertions(+), 6 deletions(-) + tools/llvm-config/llvm-config.cpp | 9 +++-- + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 744fa4e..593788a 100644 @@ -50,7 +50,7 @@ index 744fa4e..593788a 100644 set(LLVM_ENABLE_SHARED ON) else() diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index c63733f..ead11b9 100644 +index c63733f..3162091 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -522,7 +522,8 @@ int main(int argc, char **argv) { @@ -63,16 +63,9 @@ index c63733f..ead11b9 100644 } else if (Arg == "--assertion-mode") { #if defined(NDEBUG) OS << "OFF\n"; -@@ -538,9 +539,17 @@ int main(int argc, char **argv) { - } else if (Arg == "--shared-mode") { - PrintSharedMode = true; +@@ -540,7 +541,11 @@ int main(int argc, char **argv) { } else if (Arg == "--obj-root") { --OS << ActivePrefix << '\n'; -+if (IsInDevelopmentTree) { -+ OS << ActivePrefix << '\n'; -+} else { -+ OS << "/dev/null\n"; -+} + OS << ActivePrefix << '\n'; } else if (Arg == "--src-root") { -OS << LLVM_SRC_ROOT << '\n'; +if (IsInDevelopmentTree) {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.0/, sys-devel/llvm/files/3.9.0/compiler-rt/, ...
commit: 2ab1d293f6a880b9111284c26e7e71458604fa30 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 28 14:46:09 2016 + Commit: Michał Górny gentoo org> CommitDate: Sun Aug 28 16:19:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab1d293 sys-devel/llvm: Bump to 3.9.0rc3 profiles/base/package.use.mask | 6 + sys-devel/llvm/Manifest| 6 + ...e-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 0 ...clang-runtime-into-usr-lib-without-suffix.patch | 0 ...make-Make-CLANG_LIBDIR_SUFFIX-overridable.patch | 0 .../clang/darwin_prefix-include-paths.patch| 0 .../llvm/files/3.9.0/clang/default-libs.patch | 703 + .../clang/gentoo-runtime-gcc-detection-v3.patch| 0 ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 25 + .../llvm/files/{3.8.1 => 3.9.0}/lldb/six.patch | 0 .../files/{3.8.1 => 3.9.0}/llvm-config-r1.patch| 0 sys-devel/llvm/llvm-3.5.0.ebuild | 4 +- sys-devel/llvm/llvm-3.5.2.ebuild | 4 +- sys-devel/llvm/llvm-3.6.2.ebuild | 4 +- sys-devel/llvm/llvm-3.7.1-r3.ebuild| 8 +- sys-devel/llvm/llvm-3.8.0-r3.ebuild| 12 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 14 +- sys-devel/llvm/llvm-3.8.1.ebuild | 12 +- ...{llvm-3.8.0-r3.ebuild => llvm-3.9.0_rc3.ebuild} | 97 ++- sys-devel/llvm/llvm-.ebuild| 5 +- 20 files changed, 818 insertions(+), 82 deletions(-) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index bcfb9bb..4f9d441 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -5,6 +5,12 @@ # This file requires >=portage-2.1.1 # New entries go on top. +# Michał Górny(28 Aug 2016) +# lldb fails to build in the current RC, and needs a lot of minor fixes. +# It's no longer available in - line, and it won't be in 3.9.0 +# either unless somebody steps up to fix it. +>=sys-devel/llvm-3.9.0_rc lldb + # Thomas Deutschmann (26 Aug 2016) # It's only supported on amd64, ia64, powerpc and x86 dev-db/percona-server numa diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 20d4862..0d46bfc 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -4,21 +4,25 @@ DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b DIST cfe-3.8.0.src.tar.xz 9627228 SHA256 04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9 SHA512 fef431d63f95a394d53e3857fb6a6bde7a7b27f40ef5111b4353bcb63ac26febec8a9eb84780187c49699ab099834f13f996f085d02c365676b3fa5bbcc03dcd WHIRLPOOL 10fd94f75f645318ed3436454ccffd570a88cafe35e870563b5f4d89c37b9bdbe282d8793301ca53db6774cc223b2ff7ab0af99293413cac3deefcf5150fcca3 DIST cfe-3.8.1.src.tar.xz 9605548 SHA256 4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf SHA512 72d23a410271b50f97371b13dd7a6c6c5c0a993e35df436ab716ece8521d83406aa3d4bf8fdecd8154139f39fd5e011e480d405225d8c3ff152d0a2ac4573e04 WHIRLPOOL 7bcc9e6fed871b7490e2a280f2ad36008150a0af3605357fbe529aea8a7acbbed41c7da273dd150f8f50869cd321f114e909236261c4dd05ed7f644c75f208c4 +DIST cfe-3.9.0rc3.src.tar.xz 10390412 SHA256 cb06bb2403cc13bd2bc561222a9854d1aa52d96cf48b4a24d9e4b0b6832c96ec SHA512 cc7260222bf91283879fb3f59d0924df60da5f18dd73ea054a587ef4c0628f6c49ac72289c777e018462f38592dfd1bfc72f6cc5bce1f6be09782da8e420eeaa WHIRLPOOL f93c16291c35dd5e8f6483f2ad05d116a18e9fba8c3b3ae4d0e78f510345793063796b2b4587815290d1d69a35b0109ed9dc640931e9e343e4b69af350c72277 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11 DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512 6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669 WHIRLPOOL 088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/, sys-devel/llvm/
commit: 0acb9e257add056f0666ca187cb7d2dd36835558 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 25 02:12:17 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Aug 25 02:12:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acb9e25 sys-devel/llvm: Restore gtest patch for <, #592046 .../3.8.1/0005-cmake-Do-not-install-libgtest.patch | 30 ++ sys-devel/llvm/llvm-3.7.1-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.0-r3.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 2 +- sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch new file mode 100644 index ..a24977c --- /dev/null +++ b/sys-devel/llvm/files/3.8.1/0005-cmake-Do-not-install-libgtest.patch @@ -0,0 +1,30 @@ +From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Tue, 9 Jun 2015 11:58:52 +0200 +Subject: [PATCH 05/10] cmake: Do not install libgtest + +libgtest is an internal test dependency, and should not be installed to +the live system as a part of LLVM. + +Bug: http://llvm.org/bugs/show_bug.cgi?id=18341 +--- + utils/unittest/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt +index c9a2cdd..bb4f667 100644 +--- a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt +@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH) + list(APPEND LIBS pthread) + endif() + ++# Delay building until the tests pull it in, and avoid installing it ++set(EXCLUDE_FROM_ALL ON) ++ + add_llvm_library(gtest + googletest/src/gtest-all.cc + +-- +2.9.3 + diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index 02635d1..353bbff 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -155,7 +155,7 @@ src_prepare() { # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"//0005-cmake-Do-not-install-libgtest.patch + eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch # Fix llvm-config for shared linking, sane flags and return values # in order: diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index 7bd13a8..1f865ea 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -156,7 +156,7 @@ src_prepare() { # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"//0005-cmake-Do-not-install-libgtest.patch + eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch # Allow custom cmake build types (like 'Gentoo') eapply "${FILESDIR}"//0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index 7f096fc..cbead1d 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -157,7 +157,7 @@ src_prepare() { # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"//0005-cmake-Do-not-install-libgtest.patch + eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch # Allow custom cmake build types (like 'Gentoo') eapply "${FILESDIR}"//0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index 22ae082..e1050f2 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -156,7 +156,7 @@ src_prepare() { # Prevent installing libgtest # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"//0005-cmake-Do-not-install-libgtest.patch + eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch # Allow custom cmake build types (like 'Gentoo') eapply "${FILESDIR}"//0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/, sys-devel/llvm/
commit: f54e32c9597ab061f7dc8208dc5441969f521f21 Author: Michał Górny gentoo org> AuthorDate: Wed Aug 24 18:28:37 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 24 18:32:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54e32c9 sys-devel/llvm: Remove unnecessary gtest patch ...//0005-cmake-Do-not-install-libgtest.patch | 30 -- sys-devel/llvm/llvm-.ebuild| 4 --- 2 files changed, 34 deletions(-) diff --git a/sys-devel/llvm/files//0005-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files//0005-cmake-Do-not-install-libgtest.patch deleted file mode 100644 index a24977c.. --- a/sys-devel/llvm/files//0005-cmake-Do-not-install-libgtest.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Tue, 9 Jun 2015 11:58:52 +0200 -Subject: [PATCH 05/10] cmake: Do not install libgtest - -libgtest is an internal test dependency, and should not be installed to -the live system as a part of LLVM. - -Bug: http://llvm.org/bugs/show_bug.cgi?id=18341 - utils/unittest/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt -index c9a2cdd..bb4f667 100644 a/utils/unittest/CMakeLists.txt -+++ b/utils/unittest/CMakeLists.txt -@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH) - list(APPEND LIBS pthread) - endif() - -+# Delay building until the tests pull it in, and avoid installing it -+set(EXCLUDE_FROM_ALL ON) -+ - add_llvm_library(gtest - googletest/src/gtest-all.cc - --- -2.9.3 - diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild index 9a16879..834c3d2 100644 --- a/sys-devel/llvm/llvm-.ebuild +++ b/sys-devel/llvm/llvm-.ebuild @@ -103,10 +103,6 @@ src_prepare() { # https://llvm.org/bugs/show_bug.cgi?id=23781 eapply "${FILESDIR}"//0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch - # Prevent installing libgtest - # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"//0005-cmake-Do-not-install-libgtest.patch - # Allow custom cmake build types (like 'Gentoo') eapply "${FILESDIR}"//0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/, sys-devel/llvm/files/9999/, sys-devel/llvm/
commit: 7c9bce27e20c323962a0a0becd6828778ff3e3cc Author: Michał Górny gentoo org> AuthorDate: Tue Aug 23 20:29:39 2016 + Commit: Michał Górny gentoo org> CommitDate: Tue Aug 23 20:32:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9bce27 sys-devel/llvm: OCaml doc patch has been applied upstream .../0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 0 sys-devel/llvm/llvm-3.7.1-r3.ebuild | 2 +- sys-devel/llvm/llvm-3.8.0-r3.ebuild | 2 +- sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +- sys-devel/llvm/llvm-3.8.1.ebuild| 2 +- sys-devel/llvm/llvm-.ebuild | 2 -- 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-devel/llvm/files//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch similarity index 100% rename from sys-devel/llvm/files//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch rename to sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index c35f38f..02635d1 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -143,7 +143,7 @@ src_prepare() { # Fix libdir for ocaml bindings install, bug #559134 eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch + eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild index 5196fe4..7bd13a8 100644 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild @@ -144,7 +144,7 @@ src_prepare() { # Fix libdir for ocaml bindings install, bug #559134 eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch + eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index 5fdffd0..7f096fc 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -145,7 +145,7 @@ src_prepare() { # Fix libdir for ocaml bindings install, bug #559134 eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch + eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index c00669d..22ae082 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -144,7 +144,7 @@ src_prepare() { # Fix libdir for ocaml bindings install, bug #559134 eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"//0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch + eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780 diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild index 1a7dc68..9a16879 100644 --- a/sys-devel/llvm/llvm-.ebuild +++ b/sys-devel/llvm/llvm-.ebuild @@ -94,8 +94,6 @@ src_prepare() { sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 eapply "${FILESDIR}"//0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch - # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/
commit: 4003fba8c5a0f245b3f471691fe500de17fe2d1a Author: Michał Górny gentoo org> AuthorDate: Mon Aug 22 14:24:08 2016 + Commit: Michał Górny gentoo org> CommitDate: Mon Aug 22 15:11:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4003fba8 sys-devel/llvm: Remove unused patch sys-devel/llvm/files/llvm-3.7-llvm-config.patch | 113 1 file changed, 113 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch b/sys-devel/llvm/files/llvm-3.7-llvm-config.patch deleted file mode 100644 index 932c92b..000 --- a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8a51e9673859eb3fb819f0d1dad5e2a60d1a3c0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed. - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 - tools/llvm-config/CMakeLists.txt| 11 --- - tools/llvm-config/llvm-config.cpp | 22 -- - utils/llvm-build/llvmbuild/main.py | 4 +++- - 4 files changed, 27 insertions(+), 10 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index edbd8c9..9a801bd 100644 a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,12 +22,17 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") - configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 879b9ab..d2c43fa 100644 a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -323,10 +323,19 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -- } else if (Arg == "--obj-root") { --OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { --OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+OS << ActivePrefix << '\n'; -+ } else { -+OS << LLVM_SRC_ROOT << '\n'; -+ } -+} else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+} - } else { - usage(); - } -@@ -360,8 +369,9 @@ int main(int argc, char **argv) { - OS << ActiveLibDir << '/' << Lib; - } else if (PrintLibs) { - // If this is a typical library name, include it using -l. -- if (Lib.startswith("lib") && Lib.endswith(".a")) { --OS << "-l" << Lib.slice(3, Lib.size()-2); -+ if (Lib.startswith("lib") && Lib.endswith(LTDL_SHLIB_EXT)) { -+// sizeof counts trailing NUL -+OS << "-l" << Lib.slice(3, Lib.size()-sizeof(LTDL_SHLIB_EXT)+1); - continue; - } - -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index 353741f..4ba5e91 100644 a/utils/llvm-build/llvmbuild/main.py -+++
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/lldb/, sys-devel/llvm/files/3.7.1/lldb/, ...
commit: 11d093e4ec16f42e733d605dccf3100d4bb435ba Author: Michał Górny gentoo org> AuthorDate: Mon Aug 22 13:43:14 2016 + Commit: Michał Górny gentoo org> CommitDate: Mon Aug 22 15:11:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d093e4 sys-devel/llvm: Group all patches by newest version applicable .../fix_LLVMExports_cmake.patch} | 0 .../clang/gentoo-install.patch}| 0 .../gcc-5.1.patch} | 0 .../gentoo-install.patch} | 0 .../clang/fbsd-gcc49.patch}| 0 .../gcc-4.9.patch} | 0 .../gentoo-install.patch} | 0 .../nodoctargz.patch} | 0 .../ocaml-ctypes-0.4.0.patch} | 0 ...lang-runtime-into-usr-lib-without-suffix.patch} | 0 .../clang/ccc-analyzer-isystem.patch} | 0 .../clang/gentoo-install.patch}| 0 .../compiler-rt/arm_march_flags.patch} | 0 .../compiler-rt/msan-fix.patch}| 0 .../lldb/python.patch} | 0 .../lldb/tinfo.patch} | 0 .../llvm-config-0.patch} | 0 .../llvm-config-1.patch} | 0 .../llvm-config-2.patch} | 0 .../llvm-config-3.patch} | 0 .../msan-fix.patch}| 0 ...lang-runtime-into-usr-lib-without-suffix.patch} | 0 ...ake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch} | 0 .../clang/abi-tag-support-mangler.patch} | 0 .../clang/abi-tag-support-sema.patch} | 0 .../clang/darwin_prefix-include-paths.patch} | 0 .../clang/default-libs.patch} | 0 .../clang/gcc4.9-search-path.patch}| 0 .../clang/gentoo-runtime-gcc-detection-v3.patch} | 0 .../clang/musl-support.patch} | 0 ...l-compiler-rt-into-usr-lib-without-suffi.patch} | 0 .../compiler-rt/arm_march_flags.patch} | 0 .../compiler-rt/fbsd.patch}| 0 .../lldb/six.patch}| 0 .../llvm-config-r1.patch} | 0 .../llvm-config.patch} | 0 .../musl-env-support.patch}| 0 ...ll-OCaml-modules-into-correct-package-loc.patch | 71 ++ ...e-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 28 + ...t-overriding-Sphinx-HTML-doc-install-dir.patch} | 13 ++-- ...-ordering-dep-between-HTML-man-Sphinx-ta.patch} | 13 ++-- .../0005-cmake-Do-not-install-libgtest.patch} | 12 ++-- ...ake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch | 28 + ...Clean-up-exported-values-update-for-shar.patch} | 37 --- ...e-Restore-SOVERSIONs-on-shared-libraries.patch} | 10 +-- .../musl-fixes.patch} | 0 .../files/cmake/llvm-3.7.0-ocaml-build_doc.patch | 12 .../files/cmake/llvm-3.7.0-ocaml-multilib.patch| 43 - .../llvm-3.8-allow_custom_cmake_build_types.patch | 14 - sys-devel/llvm/llvm-3.5.0.ebuild | 14 ++--- sys-devel/llvm/llvm-3.5.2.ebuild | 14 ++--- sys-devel/llvm/llvm-3.6.2.ebuild | 16 ++--- sys-devel/llvm/llvm-3.7.1-r3.ebuild| 44 +++--- sys-devel/llvm/llvm-3.8.0-r3.ebuild| 34 +-- sys-devel/llvm/llvm-3.8.1-r2.ebuild| 46 +++--- sys-devel/llvm/llvm-3.8.1.ebuild | 34 +-- sys-devel/llvm/llvm-.ebuild| 18 +++--- 57 files changed, 292 insertions(+), 209 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch similarity index 100% rename from sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch rename to sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch similarity index 100% rename from sys-devel/llvm/files/clang-3.5-gentoo-install.patch rename to sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch diff --git a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch b/sys-devel/llvm/files/3.5.2/gcc-5.1.patch similarity index 100% rename from sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch rename to sys-devel/llvm/files/3.5.2/gcc-5.1.patch diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/gentoo-install.patch similarity index 100% rename from sys-devel/llvm/files/llvm-3.5-gentoo-install.patch rename to sys-devel/llvm/files/3.5.2/gentoo-install.patch diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: bf383aa2d04fcd952e797cb872eb08096061c307 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 21 18:34:41 2016 + Commit: Michał Górny gentoo org> CommitDate: Sun Aug 21 18:50:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf383aa2 sys-devel/llvm: Improve llvm-config upstream compatibility, #591690 Improve the llvm-config installed by 3.8.1-r1 (masked) and the live ebuild to match upstream behavior better, and be more compatible with packages. Restore --obj-root to return prefix on installed package, and make --src-root return invalid /dev/null path instead of failing. Bug: https://bugs.gentoo.org/591690 ...-config.patch => llvm-3.8-llvm-config-r1.patch} | 57 -- sys-devel/llvm/files/llvm-3.9-llvm-config.patch| 51 ++- sys-devel/llvm/llvm-3.8.1-r1.ebuild| 2 +- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch similarity index 59% copy from sys-devel/llvm/files/llvm-3.9-llvm-config.patch copy to sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch index d4363ad..38505f1 100644 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ b/sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch @@ -1,14 +1,14 @@ -From af798c5a6e4b2c6c98cce89b5d6fc8d33f9345cf Mon Sep 17 00:00:00 2001 +From 7422ff662be0daeb3931fde397f1fed8ff86c50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=-Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 1/2] llvm-config: Clean up exported values, update for shared +Date: Sat, 20 Aug 2016 23:47:41 +0200 +Subject: [PATCH] llvm-config: Clean up exported values, update for shared linking Gentoo-specific fixup for llvm-config, including: - wiping build-specific CFLAGS, CXXFLAGS, - updating library suffixes for shared libs, - wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, +- making --src-root return invalid path (/dev/null), - making --build-mode return "Release" rather than "Gentoo". Thanks to Steven Newbury for the initial patch. @@ -17,14 +17,16 @@ Bug: https://bugs.gentoo.org/565358 Bug: https://bugs.gentoo.org/501684 --- tools/llvm-config/CMakeLists.txt | 11 --- - tools/llvm-config/llvm-config.cpp | 20 +++- - 2 files changed, 23 insertions(+), 8 deletions(-) + tools/llvm-config/llvm-config.cpp | 9 +++-- + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 32d0f4c..6e99832 100644 +index 83794bb..eba6f45 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt -@@ -29,2 +29,6 @@ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ +@@ -23,6 +23,10 @@ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) + set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) + set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") +# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler @@ -33,36 +35,39 @@ index 32d0f4c..6e99832 100644 +# TODO: figure out if we can remove -std=c++11 and move it to revdeps. +set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -@@ -39 +43,2 @@ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) + set(LLVM_BUILD_SYSTEM cmake) + set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) +@@ -31,5 +35,6 @@ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) + set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") + set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) -set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) +# We don't do static libs, so we don't need to supply any system-libs +set(LLVM_SYSTEM_LIBS "") + if(BUILD_SHARED_LIBS) + set(LLVM_ENABLE_SHARED ON) diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..fb1bdfa 100644 +index 80f6279..309c5dc 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -525 +525,2 @@ int main(int argc, char **argv) { +@@ -485,5 +485,6 @@ int main(int argc, char **argv) { + OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; + } else if (Arg == "--build-mode") { -OS << build_mode << '\n'; +// force Release since we force non-standard Gentoo build mode +OS << "Release" << '\n'; -@@ -540,4 +541,13 @@ int main(int argc, char **argv) { -- } else if (Arg == "--obj-root") { --OS << ActivePrefix <<
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/
commit: 39e41fc4ed320afb8ba7d95efef7e4f33a728245 Author: Michał Górny gentoo org> AuthorDate: Tue Jul 5 18:11:23 2016 + Commit: Michał Górny gentoo org> CommitDate: Tue Jul 5 18:11:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e41fc4 sys-devel/llvm: Clean up obsolete patches .../llvm/files/clang-3.7-strip_doc_refs.patch | 42 -- sys-devel/llvm/files/llvm-2.7-nodoctargz.patch | 47 --- sys-devel/llvm/files/llvm-2.9-nodoctargz.patch | 39 -- sys-devel/llvm/files/llvm-3.3-gentoo-install.patch | 141 sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch | 30 - sys-devel/llvm/files/llvm-3.4-fix_varargs.patch| 148 - sys-devel/llvm/files/llvm-3.7-nodoctargz.patch | 49 --- 7 files changed, 496 deletions(-) diff --git a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch b/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch deleted file mode 100644 index 9576b92..000 --- a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch +++ /dev/null @@ -1,42 +0,0 @@ tools/clang/docs/AddressSanitizer.rst 2015-06-26 01:36:44.0 +0200 -+++ tools/clang/docs/AddressSanitizer.rst 2015-08-23 15:35:10.399174574 +0200 -@@ -198,7 +198,7 @@ - Some code should not be instrumented by AddressSanitizer. One may use the - function attribute ``__attribute__((no_sanitize("address")))`` - (which has deprecated synonyms --:ref:`no_sanitize_address ` and -+`no_sanitize_address` and - `no_address_safety_analysis`) to disable instrumentation of a particular - function. This attribute may not be supported by other compilers, so we suggest - to use it together with ``__has_feature(address_sanitizer)``. tools/clang/docs/MemorySanitizer.rst 2015-02-26 16:59:30.0 +0100 -+++ tools/clang/docs/MemorySanitizer.rst 2015-08-23 15:35:28.002200413 +0200 -@@ -82,7 +82,7 @@ - - Some code should not be checked by MemorySanitizer. - One may use the function attribute --:ref:`no_sanitize_memory ` -+`no_sanitize_memory` - to disable uninitialized checks in a particular function. - MemorySanitizer may still instrument such functions to avoid false positives. - This attribute may not be tools/clang/docs/ThreadSanitizer.rst 2015-02-18 23:26:20.0 +0100 -+++ tools/clang/docs/ThreadSanitizer.rst 2015-08-23 15:34:53.918150364 +0200 -@@ -88,7 +88,7 @@ - - Some code should not be instrumented by ThreadSanitizer. - One may use the function attribute --:ref:`no_sanitize_thread ` -+`no_sanitize_thread` - to disable instrumentation of plain (non-atomic) loads/stores in a particular function. - ThreadSanitizer still instruments such functions to avoid false positives and - provide meaningful stack traces. -@@ -102,7 +102,7 @@ - ThreadSanitizer supports ``src`` and ``fun`` entity types in - :doc:`SanitizerSpecialCaseList`, that can be used to suppress data race reports in - the specified source files or functions. Unlike functions marked with --:ref:`no_sanitize_thread ` attribute, -+`no_sanitize_thread` attribute, - blacklisted functions are not instrumented at all. This can lead to false positives - due to missed synchronization via atomic operations and missed stack frames in reports. - diff --git a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch deleted file mode 100644 index cce09eb..000 --- a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch +++ /dev/null @@ -1,47 +0,0 @@ docs/Makefile.orig 2010-04-26 15:00:58.0 +0200 -+++ docs/Makefile 2010-04-26 15:03:12.0 +0200 -@@ -46,13 +46,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: doxygen ocamldoc - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -64,12 +63,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -95,7 +93,6 @@ - install-ocamldoc: ocamldoc - $(Echo) Installing ocamldoc documentation - $(Verb) $(MKDIR)
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 12280fd5851883571f9e0f0ec44432d2bd17e187 Author: Yuta Satoh gmail com> AuthorDate: Sat Jun 18 05:44:10 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Jun 23 15:26:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12280fd5 sys-devel/llvm: Fix build fails on Gentoo/FreeBSD. Gentoo-Bug: https://bugs.gentoo.org/578064 Closes: https://github.com/gentoo/gentoo/pull/1693 Signed-off-by: Patrice Clement gentoo.org> .../llvm/files/clang-3.8-compiler-rt-fbsd.patch | 20 sys-devel/llvm/llvm-3.8.0-r2.ebuild | 7 +++ 2 files changed, 27 insertions(+) diff --git a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch b/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch new file mode 100644 index 000..297620b --- /dev/null +++ b/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch @@ -0,0 +1,20 @@ +https://llvm.org/bugs/show_bug.cgi?id=26651 +https://github.com/llvm-mirror/compiler-rt/commit/6606c7b50cbb4ec7eab4ecbebbbaaa049734bbd3 + +diff --git a/projects/compiler-rt/lib/tsan/CMakeLists.txt b/projects/compiler-rt/lib/tsan/CMakeLists.txt +index c185cfa..a151c6c 100644 +--- a/projects/compiler-rt/lib/tsan/CMakeLists.txt b/projects/compiler-rt/lib/tsan/CMakeLists.txt +@@ -192,7 +192,11 @@ endif() + add_dependencies(compiler-rt tsan) + + # Make sure that non-platform-specific files don't include any system headers. +-if(COMPILER_RT_HAS_SYSROOT_FLAG) ++# FreeBSD does not install a number of Clang-provided headers for the compiler ++# in the base system due to incompatibilities between FreeBSD's and Clang's ++# versions. As a workaround do not use --sysroot=. on FreeBSD until this is ++# addressed. ++if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + file(GLOB _tsan_generic_sources rtl/tsan*) + file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac* +rtl/tsan*linux*) diff --git a/sys-devel/llvm/llvm-3.8.0-r2.ebuild b/sys-devel/llvm/llvm-3.8.0-r2.ebuild index 71a927f..2a11830 100644 --- a/sys-devel/llvm/llvm-3.8.0-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.0-r2.ebuild @@ -170,6 +170,9 @@ src_prepare() { # disable use of SDK on OSX, bug #568758 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die + # Workaround, can be compiled with gcc on Gentoo/FreeBSD, bug #578064 + use kernel_FreeBSD && [[ $(tc-getCC) == *gcc* ]] && append-cppflags "-D_GLIBCXX_USE_C99" + if use clang; then # Automatically select active system GCC's libraries, bugs #406163 and #417913 eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch @@ -198,6 +201,10 @@ src_prepare() { # https://llvm.org/bugs/show_bug.cgi?id=23793 eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch + # Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 + # https://llvm.org/bugs/show_bug.cgi?id=26651 + eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch + pushd projects/compiler-rt >/dev/null || die # Fix WX sections, bug #421527
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 52df7e44c300fcc88fdf8dabe46c75387603715a Author: Michał Górny gentoo org> AuthorDate: Sat Jun 4 19:28:40 2016 + Commit: Michał Górny gentoo org> CommitDate: Sun Jun 5 11:47:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52df7e44 sys-devel/llvm: Drop 3.3 sys-devel/llvm/Manifest| 4 - .../llvm/files/clang-3.3-gcc-header-path.patch | 90 .../llvm/files/clang-3.3-gentoo-install.patch | 71 --- sys-devel/llvm/files/llvm-3.3-R600_debug.patch | 22 - .../llvm/files/llvm-3.3-r2-gentoo-install.patch| 117 - sys-devel/llvm/llvm-3.3-r3.ebuild | 500 - 6 files changed, 804 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index d1c47a0..be88838 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,4 +1,3 @@ -DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7 DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620 SHA512 2ad9a7daa8e62cdbf47b001aa6b937a06ae7e6396dcd1832797e2d98036522443ccfca9f1253e16d531a99d1edf237fcd2b457c55491ff68ca4534a2396ca52f WHIRLPOOL 51789ba2a3193d404b26d26b999fc47f1bc4b56b45048078cc51e4ff5c31d834d360ee0c2d16096c060f85acab6de9055dc375569348ae3307e4b280406f2d9e @@ -11,7 +10,6 @@ DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512 1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a WHIRLPOOL 3dcc302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e6bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9 -DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2 DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/
commit: 8c3d7ed8dfa3e1355338e02c675d3e76d63846b4 Author: Michał Górny gentoo org> AuthorDate: Thu May 12 10:58:07 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu May 12 11:48:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3d7ed8 sys-devel/llvm: Update compiler-rt build patch for current git ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 26 ++ sys-devel/llvm/llvm-.ebuild| 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch new file mode 100644 index 000..a09de90 --- /dev/null +++ b/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch @@ -0,0 +1,26 @@ +From 380b8faadc3fc66f9aa0528bd3578464b317c31e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Thu, 12 May 2016 08:25:48 +0200 +Subject: [PATCH] cmake: Install compiler-rt to a directory without libdir + suffix + +--- + cmake/base-config-ix.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 5d0502c..ce16ce9 100644 +--- a/projects/compiler-rt/cmake/base-config-ix.cmake b/projects/compiler-rt/cmake/base-config-ix.cmake +@@ -18,7 +18,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD) + # Setup the paths where compiler-rt runtimes and headers should be stored. + set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) + set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) ++ set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION}) + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." + ${LLVM_INCLUDE_TESTS}) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" +-- +2.8.2 + diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild index 0b8dddc..dda696c 100644 --- a/sys-devel/llvm/llvm-.ebuild +++ b/sys-devel/llvm/llvm-.ebuild @@ -179,7 +179,7 @@ src_prepare() { # Install clang runtime into /usr/lib/clang # https://llvm.org/bugs/show_bug.cgi?id=23792 eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch - eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch + eapply "${FILESDIR}"/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch # Make it possible to override CLANG_LIBDIR_SUFFIX # (that is used only to find LLVMgold.so)
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 0cb681567736f4f580e0d0a9aae65553566109c1 Author: Michał Górny gentoo org> AuthorDate: Wed May 11 20:52:13 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu May 12 11:48:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb68156 sys-devel/llvm: Backport upstream patch for gcc4.9 Gentoo header paths .../llvm/files/clang-3.8-gcc4.9-search-path.patch | 70 ++ .../{llvm-3.7.1-r1.ebuild => llvm-3.7.1-r2.ebuild} | 4 ++ .../{llvm-3.8.0-r1.ebuild => llvm-3.8.0-r2.ebuild} | 4 ++ 3 files changed, 78 insertions(+) diff --git a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch b/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch new file mode 100644 index 000..bafe218 --- /dev/null +++ b/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch @@ -0,0 +1,70 @@ +From af4db76e059c1a3f4a7f437001051ccebc8a50fe Mon Sep 17 00:00:00 2001 +From: Chandler Carruth+Date: Sun, 8 May 2016 07:59:56 + +Subject: [PATCH] Teach header search about GCC 4.9 header search paths in + Gentoo, they now use the full GCC version in their weird suffix. + +git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@268874 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Driver/ToolChains.cpp | 1 + + .../Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep | 0 + .../usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o | 0 + .../x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep| 0 + .../usr/x86_64-pc-linux-gnu/lib/.keep | 0 + test/Driver/linux-header-search.cpp | 15 +++ + 6 files changed, 16 insertions(+) + create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep + create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o + create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep + create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep + +diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp +index f905b5d..1bf17e4 100644 +--- a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp +@@ -4134,6 +4134,7 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList , + const std::string LibStdCXXIncludePathCandidates[] = { + // Gentoo is weird and places its headers inside the GCC install, + // so if the first attempt to find the headers fails, try these patterns. ++ InstallDir.str() + "/include/g++-v" + Version.Text, + InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + + Version.MinorStr, + InstallDir.str() + "/include/g++-v" + Version.MajorStr, +diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep +new file mode 100644 +index 000..e69de29 +diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o +new file mode 100644 +index 000..e69de29 +diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep +new file mode 100644 +index 000..e69de29 +diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep +new file mode 100644 +index 000..e69de29 +diff --git a/tools/clang/test/Driver/linux-header-search.cpp b/tools/clang/test/Driver/linux-header-search.cpp +index 9568bde..5f6ac50 100644 +--- a/tools/clang/test/Driver/linux-header-search.cpp b/tools/clang/test/Driver/linux-header-search.cpp +@@ -285,6 +285,21 @@ + // CHECK-GENTOO-4-6-4: "-internal-isystem" "[[RESOURCE_DIR]]{{/|}}include" + // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/include" + // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" ++// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ ++// RUN: -target x86_64-unknown-linux-gnu -stdlib=libstdc++ \ ++// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_4.9.3_tree \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=CHECK-GENTOO-4-9-3 %s ++// CHECK-GENTOO-4-9-3: "{{.*}}clang{{.*}}" "-cc1" ++// CHECK-GENTOO-4-9-3: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" ++// CHECK-GENTOO-4-9-3: "-isysroot" "[[SYSROOT:[^"]+]]" ++// CHECK-GENTOO-4-9-3: "-internal-isystem"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 234e8985ace9589ec251d7020648b9c10e4c2d25 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 28 21:22:50 2016 + Commit: Michał Górny gentoo org> CommitDate: Mon Mar 28 21:31:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234e8985 sys-devel/llvm: Update patches for the live ebuild sys-devel/llvm/files/llvm-3.9-llvm-config.patch | 72 +++-- sys-devel/llvm/llvm-.ebuild | 6 ++- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch index dc63b70..d4363ad 100644 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch @@ -1,37 +1,51 @@ -diff -Naur llvm-.orig/tools/llvm-config/CMakeLists.txt llvm-/tools/llvm-config/CMakeLists.txt llvm-.orig/tools/llvm-config/CMakeLists.txt2016-01-25 14:47:55.447301061 +0100 -+++ llvm-/tools/llvm-config/CMakeLists.txt 2016-01-25 14:54:03.897257098 +0100 -@@ -22,8 +22,12 @@ - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +From af798c5a6e4b2c6c98cce89b5d6fc8d33f9345cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Wed, 2 Dec 2015 16:04:56 +0100 +Subject: [PATCH 1/2] llvm-config: Clean up exported values, update for shared + linking + +Gentoo-specific fixup for llvm-config, including: +- wiping build-specific CFLAGS, CXXFLAGS, +- updating library suffixes for shared libs, +- wiping --system-libs for shared linking, +- banning --obj-root and --src-root due to no sources installed, +- making --build-mode return "Release" rather than "Gentoo". + +Thanks to Steven Newbury for the initial patch. + +Bug: https://bugs.gentoo.org/565358 +Bug: https://bugs.gentoo.org/501684 +--- + tools/llvm-config/CMakeLists.txt | 11 --- + tools/llvm-config/llvm-config.cpp | 20 +++- + 2 files changed, 23 insertions(+), 8 deletions(-) + +diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +index 32d0f4c..6e99832 100644 +--- a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +@@ -29,2 +29,6 @@ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ +-set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +-set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") +# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler +# specific flags will be set when we don't know what compiler will be used +# with external project utilising llvm-config. C++ Standard is required. +# TODO: figure out if we can remove -std=c++11 and move it to revdeps. - set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") ++set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}") -@@ -31,7 +35,8 @@ - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) +@@ -39 +43,2 @@ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) -set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) +# We don't do static libs, so we don't need to supply any system-libs +set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() -diff -Naur llvm-.orig/tools/llvm-config/llvm-config.cpp llvm-/tools/llvm-config/llvm-config.cpp llvm-.orig/tools/llvm-config/llvm-config.cpp 2016-01-25 14:47:55.447301061 +0100 -+++ llvm-/tools/llvm-config/llvm-config.cpp2016-01-25 14:57:05.286236312 +0100 -@@ -532,10 +532,19 @@ - OS << LLVM_HAS_RTTI << '\n'; - } else if (Arg == "--shared-mode") { - PrintSharedMode = true; +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..fb1bdfa 100644 +--- a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +@@ -525 +525,2 @@ int main(int argc, char **argv) { +-OS << build_mode << '\n'; ++// force Release since we force non-standard Gentoo build mode ++OS << "Release" << '\n'; +@@ -540,4 +541,13 @@ int main(int argc, char **argv) { - } else if (Arg ==
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: e79d6cfde502f6421df457330a87a78e51fb5601 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Mar 9 13:31:31 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Mar 9 13:35:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79d6cfd sys-devel/llvm: use system six for lldb Package-Manager: portage-2.2.27 sys-devel/llvm/files/llvm-3.8-lldb_six.patch | 13 + sys-devel/llvm/llvm-3.8.0.ebuild | 3 +++ 2 files changed, 16 insertions(+) diff --git a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch b/sys-devel/llvm/files/llvm-3.8-lldb_six.patch new file mode 100644 index 000..324f2b8 --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.8-lldb_six.patch @@ -0,0 +1,13 @@ +diff -Naur llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py +--- llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-12-11 16:43:36.0 +0100 llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2016-03-09 14:12:15.614483414 +0100 +@@ -720,9 +720,6 @@ + bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir) + + if bOk: +-bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir) +- +-if bOk: + bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs, +strFrameworkPythonDir, +strCfgBldDir) diff --git a/sys-devel/llvm/llvm-3.8.0.ebuild b/sys-devel/llvm/llvm-3.8.0.ebuild index b2b1ec3..f8e26f5 100644 --- a/sys-devel/llvm/llvm-3.8.0.ebuild +++ b/sys-devel/llvm/llvm-3.8.0.ebuild @@ -39,6 +39,7 @@ COMMON_DEPEND=" gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) + lldb? ( dev-python/six[${PYTHON_USEDEP}] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= @@ -216,6 +217,8 @@ src_prepare() { # https://llvm.org/bugs/show_bug.cgi?id=18841 sed -e 's/add_subdirectory(readline)/#&/' \ -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die + # Do not install bundled six module + epatch "${FILESDIR}"/${PN}-3.8-lldb_six.patch fi # User patches
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/
commit: 403306332c7ae107ff8bd4579e988667fb43c84c Author: Michał Górny gentoo org> AuthorDate: Wed Feb 17 21:41:10 2016 + Commit: Michał Górny gentoo org> CommitDate: Wed Feb 17 22:05:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40330633 sys-devel/llvm: Update the llvm-config for the live version, #574918 sys-devel/llvm/files/llvm-3.9-llvm-config.patch | 21 - 1 file changed, 21 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch index 90984e6..dc63b70 100644 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch @@ -52,24 +52,3 @@ diff -Naur llvm-.orig/tools/llvm-config/llvm-config.cpp llvm-/tools/llvm } else if (Arg == "--link-shared") { LinkMode = LinkModeShared; } else if (Arg == "--link-static") { -diff -Naur llvm-.orig/utils/llvm-build/llvmbuild/main.py llvm-/utils/llvm-build/llvmbuild/main.py llvm-.orig/utils/llvm-build/llvmbuild/main.py 2016-01-25 14:47:55.511301054 +0100 -+++ llvm-/utils/llvm-build/llvmbuild/main.py 2016-01-25 14:58:13.014228689 +0100 -@@ -393,6 +393,8 @@ - // - //===--===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ - if library_name is None: - library_name_as_cstr = 'nullptr' - else: --library_name_as_cstr = '"lib%s.a"' % library_name -+library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - if is_installed: - is_installed_as_cstr = 'true' - else:
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 7449e122ce962900ac9411971a06c2416c967e08 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 7 09:16:57 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 7 22:09:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7449e122 sys-devel/llvm: Remove ancient 2.8 version sys-devel/llvm/Manifest | 1 - sys-devel/llvm/files/llvm-2.8-alignof.patch | 59 -- sys-devel/llvm/files/llvm-2.8-darwin8.patch | 15 --- sys-devel/llvm/llvm-2.8-r2.ebuild | 168 4 files changed, 243 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 0ece351..f23c5de 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -20,7 +20,6 @@ DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256 227fa998520bc94974a428dc8e7654d DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223 DIST lldb-3.7.0.src.tar.xz 10649660 SHA256 f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512 52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df WHIRLPOOL 8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43 DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a -DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440 DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef diff --git a/sys-devel/llvm/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch deleted file mode 100644 index ae7f314..000 --- a/sys-devel/llvm/files/llvm-2.8-alignof.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: include/llvm/ADT/StringMap.h -=== include/llvm/ADT/StringMap.h (révision 117773) -+++ include/llvm/ADT/StringMap.h (révision 117774) -@@ -167,7 +167,7 @@ - - unsigned AllocSize = static_cast(sizeof(StringMapEntry))+ - KeyLength+1; --unsigned Alignment = alignof(); -+unsigned Alignment = alignOf(); - - StringMapEntry *NewItem = - static_cast(Allocator.Allocate(AllocSize,Alignment)); -Index: include/llvm/Support/AlignOf.h -=== include/llvm/Support/AlignOf.h (révision 117773) -+++ include/llvm/Support/AlignOf.h (révision 117774) -@@ -49,12 +49,12 @@ - - }; - --/// alignof - A templated function that returns the mininum alignment of -+/// alignOf - A templated function that returns the mininum alignment of - /// of a type. This provides no extra functionality beyond the AlignOf - /// class besides some cosmetic cleanliness. Example usage: --/// alignof() returns the alignment of an int. -+/// alignOf() returns the alignment of an int. - template --static
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cl-patches/, sys-devel/llvm/, sys-devel/llvm/files/
commit: e6337c4fed1e26111f0f8cb3cbeee486c3c8db77 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 7 14:12:21 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 7 22:09:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6337c4f sys-devel/llvm: Remove ancient 3.1 version sys-devel/llvm/Manifest| 1 - .../0001-r600-Add-some-intrinsic-definitions.patch | 64 --- ...t_global_size-and-get_local_size-intrinsi.patch | 27 --- .../llvm/files/llvm-2.6-commandguide-nops.patch| 30 .../llvm-3.1-ExecutionEngine_tests_xfail_arm.patch | 27 --- .../files/llvm-3.1-docs-pod-markup-fixes.patch | 28 --- .../llvm/files/llvm-3.1-fix_debug_line_info.patch | 65 --- .../llvm/files/llvm-3.1-ivybridge_support.patch| 13 -- sys-devel/llvm/llvm-3.1-r2.ebuild | 191 - 9 files changed, 446 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 90b47c4..b0970e7 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -20,7 +20,6 @@ DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256 227fa998520bc94974a428dc8e7654d DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223 DIST lldb-3.7.0.src.tar.xz 10649660 SHA256 f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512 52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df WHIRLPOOL 8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43 DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a -DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef DIST llvm-3.2-manpages.tar.bz2 25962 SHA256 159eaaaf59a2cee66f6aa0bbc93ca4c9fa37a9a25d4116f085556cdbc32f75ca SHA512 75ce41827f99b9e08f0c3e374c49f8a231653bca28bea158ece551e5934bc61ae21bfaf158490f83b05c1a7926b95c8832c0eb023280dcafa671e7d551efa17e WHIRLPOOL 58382b3e92b2ef8b1f5a7ebf2d893852253976b781b2b2acd11dfd914fad9776f59ddc5559d3986832a00fde88539db6a5882aa69a6f3ceca90337a59420acc1 DIST llvm-3.2.src.tar.gz 12275252 SHA256 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 SHA512 cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc WHIRLPOOL c3a39b2426293d0251b7769607ade873bb6bf8d54e7c8055773a9b75742bc8e39049fb71409a258c6f3d98775b78c280d4bfe4223ba91e5ed6ecae0eddf910e5 DIST llvm-3.3-manpages.tar.bz2 27098 SHA256 46bb22d63d5fe7dd04e1a7bb7e16c03d93f2ed51d31540cfb9d97ed70059aa77 SHA512 6f24b66b13025d0606908f91ad9b4fc6de1b4aac2d97d261f6b989065476cf153d2f84792f8dd4972b95fb1a45a3931c328df3bcf8ce5ab21170a7a912a39783 WHIRLPOOL 31b9c3635b698f404b75b87c7891b4b6be9cbeb6062bcb6fba5476b0b3069a486ba60c27ab2b12b8a2da9404f17162041860f023951050a9fc4c7d27748a diff --git a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch deleted file mode 100644 index 9d99c9c..000 --- a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001 -From: Tom Stellard-Date: Tue, 13 Mar 2012 14:12:21 -0400 -Subject: [PATCH 1/2] r600: Add some intrinsic definitions - - include/llvm/Intrinsics.td |1 + - include/llvm/IntrinsicsR600.td | 35 +++ - 2 files changed, 36 insertions(+), 0 deletions(-) - create mode 100644 include/llvm/IntrinsicsR600.td - -diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td -index 069f907..e90dd85 100644 a/include/llvm/Intrinsics.td -+++ b/include/llvm/Intrinsics.td -@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td" - include "llvm/IntrinsicsXCore.td" - include
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 4ea0768355d83631d0baf5c7de9b712ea2ebe12a Author: Michał Górny gentoo org> AuthorDate: Sun Dec 27 22:47:38 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 27 22:51:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea07683 sys-devel/llvm: Backport msan fix for 4.1+ kernels, bug #569894 .../llvm/files/compiler-rt-3.7-msan-fix.patch | 86 sys-devel/llvm/files/llvm-3.7-msan-fix.patch | 79 +++ sys-devel/llvm/llvm-3.7.0-r5.ebuild| 540 + 3 files changed, 705 insertions(+) diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch new file mode 100644 index 000..3854a18 --- /dev/null +++ b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch @@ -0,0 +1,86 @@ +From 5dad120f9c9bc74c73edadb0467d8df81ae46066 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu"+Date: Wed, 5 Aug 2015 05:34:27 -0700 +Subject: [PATCH 08/13] Apply split-layout-compiler-rt.patch + +https://llvm.org/bugs/show_bug.cgi?id=24155 +--- + lib/msan/msan.h| 30 -- + lib/msan/msan_allocator.cc | 12 +++- + 2 files changed, 31 insertions(+), 11 deletions(-) + +diff --git a/lib/msan/msan.h b/lib/msan/msan.h +index cd8bc19..6251b38 100644 +--- a/lib/msan/msan.h b/lib/msan/msan.h +@@ -94,17 +94,27 @@ const MappingDesc kMemoryLayout[] = { + + #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 + +-// Requries PIE binary and ASLR enabled. +-// Main thread stack and DSOs at 0x7f00 (sometimes 0x7e00). +-// Heap at 0x6000. ++// All of the following configurations are supported. ++// ASLR disabled: main executable and DSOs at 0x5000 ++// PIE and ASLR: main executable and DSOs at 0x7f00 ++// non-PIE: main executable below 0x1, DSOs at 0x7f00 ++// Heap at 0x7000. + const MappingDesc kMemoryLayout[] = { +-{0xULL, 0x2000ULL, MappingDesc::INVALID, "invalid"}, +-{0x2000ULL, 0x4000ULL, MappingDesc::SHADOW, "shadow"}, +-{0x4000ULL, 0x6000ULL, MappingDesc::ORIGIN, "origin"}, +-{0x6000ULL, 0x8000ULL, MappingDesc::APP, "app"}}; +- +-#define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x4000ULL) +-#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x2000ULL) ++{0xULL, 0x0500ULL, MappingDesc::APP, "app-1"}, ++{0x0500ULL, 0x1000ULL, MappingDesc::SHADOW, "shadow-2"}, ++{0x1000ULL, 0x1500ULL, MappingDesc::INVALID, "invalid"}, ++{0x1500ULL, 0x2000ULL, MappingDesc::ORIGIN, "origin-2"}, ++{0x2000ULL, 0x3000ULL, MappingDesc::SHADOW, "shadow-3"}, ++{0x3000ULL, 0x4000ULL, MappingDesc::ORIGIN, "origin-3"}, ++{0x4000ULL, 0x5000ULL, MappingDesc::INVALID, "invalid"}, ++{0x5000ULL, 0x5500ULL, MappingDesc::SHADOW, "shadow-1"}, ++{0x5500ULL, 0x6000ULL, MappingDesc::APP, "app-2"}, ++{0x6000ULL, 0x6500ULL, MappingDesc::ORIGIN, "origin-1"}, ++{0x6500ULL, 0x7000ULL, MappingDesc::INVALID, "invalid"}, ++{0x7000ULL, 0x8000ULL, MappingDesc::APP, "app-3"}}; ++ ++#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x5000ULL) ++#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x1000ULL) + + #else + #error "Unsupported platform" +diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc +index 6df3566..e588bf8 100644 +--- a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc +@@ -49,7 +49,8 @@ struct MsanMapUnmapCallback { + typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata), +SizeClassMap, kRegionSizeLog, ByteMap, +MsanMapUnmapCallback> PrimaryAllocator; +-#elif defined(__x86_64__) ++ ++#elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64 + static const uptr kAllocatorSpace = 0x6000ULL; + static const uptr kAllocatorSize = 0x800; // 8T. + static const uptr kMetadataSize = sizeof(Metadata); +@@ -67,6 +68,15 @@ struct MsanMapUnmapCallback { + typedef SizeClassAllocator64 PrimaryAllocator; ++#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 ++ static const uptr kAllocatorSpace = 0x7000ULL; ++ static const uptr kAllocatorSize = 0x800; // 8T. ++ static const uptr kMetadataSize = sizeof(Metadata); ++ static const uptr kMaxAllowedMallocSize = 8UL << 30; ++ ++ typedef SizeClassAllocator64
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: 820607525306cb9f19b9bc1452540b8b1cacb08d Author: Michał Górny gentoo org> AuthorDate: Sat Dec 5 15:45:40 2015 + Commit: Michał Górny gentoo org> CommitDate: Sat Dec 5 15:49:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82060752 sys-devel/llvm: Update live ebuild, fix Python install Update the patches and install procedure for git changes. Switch to python-single-r1 as most of the Python components are now installed by CMake. .../llvm/files/clang-3.8-gentoo-install.patch | 14 --- sys-devel/llvm/files/llvm-3.8-llvm-config.patch| 103 + sys-devel/llvm/llvm-.ebuild| 61 +--- 3 files changed, 125 insertions(+), 53 deletions(-) diff --git a/sys-devel/llvm/files/clang-3.8-gentoo-install.patch b/sys-devel/llvm/files/clang-3.8-gentoo-install.patch deleted file mode 100644 index 25c4fca..000 --- a/sys-devel/llvm/files/clang-3.8-gentoo-install.patch +++ /dev/null @@ -1,14 +0,0 @@ - tools/clang/tools/scan-view/scan-view | 2 +- - -diff --git a/tools/clang/tools/scan-view/bin/scan-view b/tools/clang/tools/scan-view/bin/scan-view -index fb27da6..1f8ddb8 100755 a/tools/clang/tools/scan-view/bin/scan-view -+++ b/tools/clang/tools/scan-view/bin/scan-view -@@ -66,2 +66,2 @@ def start_browser(port, options): --import ScanView -+from clang import ScanView - try: --- -1.8.4.4 - diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch b/sys-devel/llvm/files/llvm-3.8-llvm-config.patch new file mode 100644 index 000..acc0601 --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.8-llvm-config.patch @@ -0,0 +1,103 @@ +From cc0ac62d1c03206bc3a1edba4d60f97921b854f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Fri, 4 Dec 2015 20:45:33 +0100 +Subject: [PATCH] llvm-config: Clean up exported values, update for shared + linking + +Gentoo-specific fixup for llvm-config, including: +- wiping build-specific CFLAGS, CXXFLAGS, +- updating library suffixes for shared libs, +- wiping --system-libs for shared linking, +- banning --obj-root and --src-root due to no sources installed. + +Thanks to Steven Newbury for the initial patch. + +Bug: https://bugs.gentoo.org/565358 +Bug: https://bugs.gentoo.org/501684 +--- + tools/llvm-config/CMakeLists.txt | 9 +++-- + tools/llvm-config/llvm-config.cpp | 17 + + utils/llvm-build/llvmbuild/main.py | 5 - + 3 files changed, 24 insertions(+), 7 deletions(-) + +diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +index 83794bb..21fd845 100644 +--- a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +@@ -22,15 +22,20 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) + set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) + set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) + set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") ++# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler ++# specific flags will be set when we don't know what compiler will be used ++# with external project utilising llvm-config. C++ Standard is required. ++# TODO: figure out if we can remove -std=c++11 and move it to revdeps. + set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") +-set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") ++set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") + set(LLVM_BUILD_SYSTEM cmake) + set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) + + # Use the C++ link flags, since they should be a superset of C link flags. + set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") + set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) +-set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) ++# We don't do static libs, so we don't need to supply any system-libs ++set(LLVM_SYSTEM_LIBS "") + if(BUILD_SHARED_LIBS) + set(LLVM_ENABLE_SHARED ON) + else() +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 80f6279..b16b9a3 100644 +--- a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +@@ -497,10 +497,19 @@ int main(int argc, char **argv) { + OS << LLVM_HAS_RTTI << '\n'; + } else if (Arg == "--shared-mode") { + PrintSharedMode = true; +- } else if (Arg == "--obj-root") { +-OS << ActivePrefix << '\n'; +- } else if (Arg == "--src-root") { +-OS << LLVM_SRC_ROOT << '\n'; ++ } else if (Arg == "--obj-root" || Arg == "--src-root") { ++if (IsInDevelopmentTree) { ++ if (Arg == "--obj-root") { ++OS << ActivePrefix << '\n'; ++ } else { ++OS << LLVM_SRC_ROOT << '\n'; ++ } ++} else { ++ // sources are not installed ++
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/
commit: c920eb1e343b78b6ddf21915654103e12c4c83dc Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Oct 27 18:32:38 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Oct 27 18:32:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c920eb1e sys-devel/llvm: fix compilation on armv5 Bug #562706 by maekke compiler-rt forces some -march flags when detecting arm Package-Manager: portage-2.2.23 .../cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch | 16 sys-devel/llvm/llvm-3.7.0-r2.ebuild | 4 2 files changed, 20 insertions(+) diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch new file mode 100644 index 000..943a840 --- /dev/null +++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch @@ -0,0 +1,16 @@ +diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake +--- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.0 +0200 llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100 +@@ -209,12 +209,6 @@ + test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") + test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") + endif() +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") +-test_target_arch(arm "" "-march=armv7-a") +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") +-test_target_arch(aarch32 "" "-march=armv8-a") +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") +-test_target_arch(aarch64 "" "-march=armv8-a") + endif() + set(COMPILER_RT_OS_SUFFIX "") + endif() diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild index c63f370..8856b56 100644 --- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild +++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild @@ -181,6 +181,10 @@ src_prepare() { epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch + # Do not force -march flags on arm platforms + # https://bugs.gentoo.org/show_bug.cgi?id=562706 + epatch "${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch + # Make it possible to override CLANG_LIBDIR_SUFFIX # (that is used only to find LLVMgold.so) # https://llvm.org/bugs/show_bug.cgi?id=23793
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/
commit: 77e4cb85f6781ff1bb88bc9b9033f65226673ef7 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Oct 12 18:22:07 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 12 18:22:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e4cb85 sys-devel/llvm: fix some USE=ocaml issues Bug: 559624 Bug: 562008 Package-Manager: portage-2.2.23 sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch | 12 sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch | 8 sys-devel/llvm/llvm-3.7.0-r2.ebuild | 7 +-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch new file mode 100644 index 000..d53ce19 --- /dev/null +++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch @@ -0,0 +1,12 @@ +diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt +--- llvm-3.7.0.src.orig/docs/CMakeLists.txt2015-08-18 18:48:44.0 +0200 llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200 +@@ -115,7 +115,7 @@ + endif() + + list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml) +-if( NOT uses_ocaml LESS 0 ) ++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS ) + set(doc_targets + ocaml_llvm + ocaml_llvm_all_backends diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch index caba3d1..024bad7 100644 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch +++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch @@ -14,13 +14,13 @@ install(FILES ${install_files} - DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) install(FILES ${install_shlibs} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) foreach( install_file ${install_files} ${install_shlibs} ) get_filename_component(filename "${install_file}" NAME) @@ -31,7 +31,7 @@ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" - DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) endforeach() --- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.0 +1100 +++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000 @@ -40,4 +40,4 @@ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" -DESTINATION lib/ocaml) -+DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml) ++DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild index de885b7..303ce98 100644 --- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild +++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild @@ -40,9 +40,10 @@ COMMON_DEPEND=" libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) ocaml? ( - dev-lang/ocaml:0= + >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib - dev-ml/ocaml-ctypes )" + dev-ml/ocaml-ctypes + !!<=sys-devel/llvm-3.7.0-r2[ocaml] )" # configparser-3.2 breaks the build (3.3 or none at all are fine) DEPEND="${COMMON_DEPEND} dev-lang/perl @@ -151,6 +152,8 @@ src_prepare() { sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die # Fix libdir for ocaml bindings install, bug #559134 epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch + # Do not build/install ocaml docs with USE=-doc, bug #562008 + epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch # Make it possible to override Sphinx HTML install dirs # https://llvm.org/bugs/show_bug.cgi?id=23780
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/
commit: c4ea50ca83bfb8f0a402b4f9217eeaa9cbc85c20 Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Oct 11 18:38:48 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Oct 11 18:39:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ea50ca sys-devel/llvm: bump to fix lldb python install Bug: 562436 Bug: 562438 Package-Manager: portage-2.2.23 sys-devel/llvm/files/llvm-3.7-lldb_python.patch | 23 ++ sys-devel/llvm/llvm-3.7.0-r2.ebuild | 504 2 files changed, 527 insertions(+) diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch new file mode 100644 index 000..1a95827 --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch @@ -0,0 +1,23 @@ +diff -Naur llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py +--- llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-06-04 05:12:37.0 +0200 llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-10-11 19:19:54.074935710 +0200 +@@ -371,14 +371,14 @@ + strLibFileExtn = ".dylib"; + else: + strLibFileExtn = ".so"; +-strSrc = os.path.join("lib", "liblldb" + strLibFileExtn); ++strSrc = os.path.join("GENTOO_LIBDIR", "liblldb" + strLibFileExtn); + +-if eOSType != utilsOsType.EnumOsType.Windows: ++#if eOSType != utilsOsType.EnumOsType.Windows: + # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is + # effective. +-bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); +-if not bOk: +-return (bOk, strErrMsg) ++#bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); ++#if not bOk: ++#return (bOk, strErrMsg) + + bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget ); + diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild new file mode 100644 index 000..de885b7 --- /dev/null +++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild @@ -0,0 +1,504 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +PYTHON_COMPAT=( python2_7 pypy ) + +inherit check-reqs cmake-utils eutils flag-o-matic multilib \ + multilib-minimal python-r1 toolchain-funcs pax-utils + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="http://llvm.org/; +SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz + clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz + http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz + http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz ) + lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) + !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )" + +LICENSE="UoI-NCSA" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml + python +static-analyzer test xml video_cards_radeon kernel_Darwin" + +COMMON_DEPEND=" + sys-libs/zlib:0= + clang? ( + python? ( ${PYTHON_DEPS} ) + static-analyzer? ( + dev-lang/perl:* + ${PYTHON_DEPS} + ) + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) + ) + gold? ( >=sys-devel/binutils-2.22:*[cxx] ) + libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) + libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) + ocaml? ( + dev-lang/ocaml:0= + dev-ml/findlib + dev-ml/ocaml-ctypes )" +# configparser-3.2 breaks the build (3.3 or none at all are fine) +DEPEND="${COMMON_DEPEND} + dev-lang/perl + >=sys-devel/make-3.81 + >=sys-devel/flex-2.5.4 + >=sys-devel/bison-1.875d + || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 + ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) + ) + || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) + kernel_Darwin? ( sys-libs/libcxx ) + clang? ( xml? ( virtual/pkgconfig ) ) + doc? ( dev-python/sphinx ) + gold? ( sys-libs/binutils-libs ) + libffi? ( virtual/pkgconfig ) + lldb? ( dev-lang/swig ) + !! "${T}"/test.cxx || die + ebegin "Trying to build a C++11 test program" + if !
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/
commit: 9ff44a9a9eaa6b21f61320cb9d8d0781dcea3acf Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Sep 2 09:48:50 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Sep 2 09:49:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff44a9a sys-devel/llvm: bump to final release Also fixes WX sections and multilib-strict install forocaml bindings Both fixes from gienah, bugs #421527 and #559134 Package-Manager: portage-2.2.20.1 sys-devel/llvm/Manifest| 11 +++--- .../files/cmake/llvm-3.7.0-ocaml-multilib.patch| 43 ++ .../{llvm-3.7.0_rc3.ebuild => llvm-3.7.0.ebuild} | 26 +++-- sys-devel/llvm/llvm-.ebuild| 7 4 files changed, 71 insertions(+), 16 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 6f8f423..112f58f 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -6,7 +6,7 @@ DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f DIST cfe-3.6.0.src.tar.xz 8640776 SHA256 be0e69378119fe26f0f2f74cffe82b7c26da840c9733fe522ed3c1b66b11082d SHA512 dc137bdf9c2c5adb25498c995f0b944016699267156a595cc1fe6127f6961d45162275023d194db42691d80fa8fc74f56abad9c145ef1ff492881f547ca76cfe WHIRLPOOL 0df122c9d32dba5a00a97bec4a54b7b7bd8241ef625357bcf9997e3670e7c4775becec971f572073f3ffad86c7ccf616a94c06926ef9b0528248e34958e9b43f DIST cfe-3.6.1.src.tar.xz 8616132 SHA256 74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7 SHA512 a96944bccfd9341be7adafdcc40367d458e85e7e74b0d2f3a7ea18edf1454d04a232c2d0003d6449c52f81d1e235b434acc1bb63eb5f7d16f8f4a43b70826743 WHIRLPOOL 1b4b8bb33fc7dbaeb03f32ba3544580bf0424889705b9d5130127be4d514c6d2aae5e224d71e20595a31441fc4bdd7bbf647e99e57d2c1e17fff3cff9022faa1 DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea32c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8 -DIST cfe-3.7.0rc3.src.tar.xz 9146940 SHA256 da5507898510903c6f4bb80288980af4baa26234d2eefdcf8fd023738c48c06b SHA512 2d70499792f869332a3cb253046128577f1c4e87035cafe78a6b4786ace81b080ffe2d6241579e2a695ea0545570cd2a22be7d11e36d32a4530e386fde24d89c WHIRLPOOL d598aad36613346d93f43463134e9b2aed4cb0fa8687171f5e79684fd5c6294b9eb204f00aca0221bd873f10706929dde39b38faf0475adedb729a2bcc4537d8 +DIST cfe-3.7.0.src.tar.xz 9147204 SHA256 4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc SHA512 099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae WHIRLPOOL 1078d962edfb1b90044f19921f64a28c32259e34d983ddf9f9c198d13c8cd0679778a640d7a06c0bf1224d982602294c79a510034276216e3a6de21c739e6c39 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1 WHIRLPOOL c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11 DIST clang-tools-extra-3.5.1.src.tar.xz 215776 SHA256 e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906 SHA512 eefacd6857584c9a3186815a7d015a595f32cd926f6c221245d388b8cb9266c52e0980a8e94f01f49c452510fdd42e659b02f116619d3d0e35170566f0704712 WHIRLPOOL a3d14e21f201cc02649833edd67ba04f17c88486fbf399327dbb76d21e151b956a4f58cd7446b8563f72fa1cee06a8bd4abbc53234761a3a69fc1afc99ced87d @@ -14,7 +14,7 @@ DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266 DIST clang-tools-extra-3.6.0.src.tar.xz 248688 SHA256 3aa949ba82913490a75697287d9ee8598c619fae0aa6bb8fddf0095ff51bc812 SHA512 52e0cd3cce3047bb98d52e5c03ac4a8c549fcdc628f57492727f3e7659b2d4bd29ad98ab4ebab387233911fbb098861ec020b28c051e6b2c17d73dd490beebf3 WHIRLPOOL 423f018a2943d16ac605d36bece61046423974c2ffbcc7e4a9aebc5efbb2444ecead70e46bc05f51f4fedbfef338d177b5b16969e8fb0df0bbc911200ce483ae DIST clang-tools-extra-3.6.1.src.tar.xz 248592 SHA256 f4ee70d870d550a9147ac6a548ce7daf7d9e6897348bf411f43c572966fb92b6 SHA512 3273f8c1fa1683de231d0c0b9371d4b7537381e939fe38996e70a8005a1e6185da459ace2f260fad41df4840b459448ed1498c2fd576dd560005117a54e2ccb9 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/, sys-devel/llvm/
commit: 5a12ed0f73c8773aaa230e8d66ffce7ea329f866 Author: Bernard Cafarelli voyageur AT gentoo DOT org AuthorDate: Mon Aug 24 15:29:03 2015 + Commit: Bernard Cafarelli voyageur AT gentoo DOT org CommitDate: Mon Aug 24 15:30:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a12ed0f sys-devel/llvm: fix live ebuild Fixes bugs #553416, #557100 and #557154 ...g-runtime-into-usr-lib-without-suffix-3.8.patch | 37 ++ .../llvm-3.8-allow_custom_cmake_build_types.patch | 14 sys-devel/llvm/llvm-3.7.0_rc2.ebuild | 2 +- sys-devel/llvm/llvm-.ebuild| 8 - 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch new file mode 100644 index 000..0dd976c --- /dev/null +++ b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch @@ -0,0 +1,37 @@ +diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp +index fa7780f..e3a6c8f 100644 +--- a/tools/clang/lib/Driver/Driver.cpp b/tools/clang/lib/Driver/Driver.cpp +@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, + if (ClangResourceDir != ) { + llvm::sys::path::append(P, ClangResourceDir); + } else { +-StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); +-llvm::sys::path::append(P, .., Twine(lib) + ClangLibdirSuffix, clang, ++llvm::sys::path::append(P, .., lib, clang, + CLANG_VERSION_STRING); + } + ResourceDir = P.str(); +diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp +index f078b37..0c514fc 100644 +--- a/tools/clang/lib/Frontend/CompilerInvocation.cpp b/tools/clang/lib/Frontend/CompilerInvocation.cpp +@@ -1097,7 +1097,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, + if (ClangResourceDir != ) + llvm::sys::path::append(P, ClangResourceDir); + else +-llvm::sys::path::append(P, .., Twine(lib) + CLANG_LIBDIR_SUFFIX, ++llvm::sys::path::append(P, .., lib, clang, + clang, CLANG_VERSION_STRING); + + return P.str(); +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 7de5fbe..49f439b 100644 +--- a/tools/clang/lib/Headers/CMakeLists.txt b/tools/clang/lib/Headers/CMakeLists.txt +@@ -98,4 +98,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER Misc) + install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION lib/clang/${CLANG_VERSION}/include) diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch new file mode 100644 index 000..e42c08a --- /dev/null +++ b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt 2015-08-12 20:04:55.397881480 +0200 b/CMakeLists.txt 2015-08-12 20:05:06.625741113 +0200 +@@ -152,11 +152,6 @@ + + string(TOUPPER ${CMAKE_BUILD_TYPE} uppercase_CMAKE_BUILD_TYPE) + +-if (CMAKE_BUILD_TYPE AND +-NOT uppercase_CMAKE_BUILD_TYPE MATCHES ^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$) +- message(FATAL_ERROR Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}) +-endif() +- + set(LLVM_LIBDIR_SUFFIX CACHE STRING Define suffix of library directory name (32/64) ) + + # They are used as destination of target generators. diff --git a/sys-devel/llvm/llvm-3.7.0_rc2.ebuild b/sys-devel/llvm/llvm-3.7.0_rc2.ebuild index b2ed256..3ea912f 100644 --- a/sys-devel/llvm/llvm-3.7.0_rc2.ebuild +++ b/sys-devel/llvm/llvm-3.7.0_rc2.ebuild @@ -21,7 +21,7 @@ SRC_URI=http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.7.0_}/${P/_}.src.tar.xz LICENSE=UoI-NCSA SLOT=0/${PV} -KEYWORDS= +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos IUSE=clang debug +doc gold libedit +libffi lldb multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon kernel_Darwin diff --git a/sys-devel/llvm/llvm-.ebuild b/sys-devel/llvm/llvm-.ebuild index aa013b6..a11342a 100644 --- a/sys-devel/llvm/llvm-.ebuild +++ b/sys-devel/llvm/llvm-.ebuild @@ -168,6 +168,9 @@ src_prepare() { # https://llvm.org/bugs/show_bug.cgi?id=18341 epatch ${FILESDIR}/cmake/0004-cmake-Do-not-install-libgtest.patch + # Allow custom cmake build types (like 'Gentoo') + epatch ${FILESDIR}/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch + if use clang; then # Automatically
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/cmake/
commit: c8b08cf3c2abeb9e6a893ee8b7006b8a51eb3573 Author: Bernard Cafarelli voyageur AT gentoo DOT org AuthorDate: Mon Aug 24 15:52:56 2015 + Commit: Bernard Cafarelli voyageur AT gentoo DOT org CommitDate: Mon Aug 24 15:53:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b08cf3 sys-devel/llvm: fix typo in updated patch Package-Manager: portage-2.2.20.1 ...ang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch index 0dd976c..cf2ca59 100644 --- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch +++ b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch @@ -21,7 +21,7 @@ index f078b37..0c514fc 100644 llvm::sys::path::append(P, ClangResourceDir); else -llvm::sys::path::append(P, .., Twine(lib) + CLANG_LIBDIR_SUFFIX, -+llvm::sys::path::append(P, .., lib, clang, ++llvm::sys::path::append(P, .., lib, clang, CLANG_VERSION_STRING); return P.str();