From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22198138334 for ; Fri, 1 Feb 2019 04:37:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 236ADE085A; Fri, 1 Feb 2019 04:37:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DECD5E085A for ; Fri, 1 Feb 2019 04:37:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 780A3335C31 for ; Fri, 1 Feb 2019 04:37:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAD994D7 for ; Fri, 1 Feb 2019 04:36:58 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1548995801.9bd888b197bae54fa4b5d6033768f2438180b314.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch dev-lang/rust/rust-1.32.0.ebuild X-VCS-Directories: dev-lang/rust/files/ dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 9bd888b197bae54fa4b5d6033768f2438180b314 X-VCS-Branch: master Date: Fri, 1 Feb 2019 04:36:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e6d5cdd-b65a-4a80-a4b7-7767b3114792 X-Archives-Hash: e34af4439d5a95374b9f12842bc0af5e commit: 9bd888b197bae54fa4b5d6033768f2438180b314 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Feb 1 04:07:49 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Feb 1 04:36:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd888b1 dev-lang/rust: re-add cblas patch Since some systems have stale cblas.h symlink rust's bundled llvm finds cblas.h and tries to link unconditionally. Fix it. This reverts commit 0e00cd7cc089acdd3114b4aafc34fc921aabe058. Closes: https://bugs.gentoo.org/676278 Signed-off-by: Georgy Yakovlev gentoo.org> .../1.32.0-fix-configure-of-bundled-llvm.patch | 32 ++++++++++++++++++++++ dev-lang/rust/rust-1.32.0.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch b/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch new file mode 100644 index 00000000000..eaeab87774e --- /dev/null +++ b/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch @@ -0,0 +1,32 @@ +Revert "[CMake] Unconditionally add .h and .td files to target sources" + +This reverts commit https://github.com/llvm-mirror/llvm/commit/6fb010f388bb2cb2f00fe039123092308ac4865d. + +Bug: https://bugs.gentoo.org/675752#c7 +--- a/src/llvm/cmake/modules/LLVMProcessSources.cmake ++++ b/src/llvm/cmake/modules/LLVMProcessSources.cmake +@@ -52,15 +52,16 @@ function(llvm_process_sources OUT_VAR) + cmake_parse_arguments(ARG "" "" "ADDITIONAL_HEADERS;ADDITIONAL_HEADER_DIRS" ${ARGN}) + set(sources ${ARG_UNPARSED_ARGUMENTS}) + llvm_check_source_file_list( ${sources} ) +- +- # This adds .td and .h files to the Visual Studio solution: +- add_td_sources(sources) +- find_all_header_files(hdrs "${ARG_ADDITIONAL_HEADER_DIRS}") +- if (hdrs) +- set_source_files_properties(${hdrs} PROPERTIES HEADER_FILE_ONLY ON) ++ if( LLVM_ENABLE_IDE ) ++ # This adds .td and .h files to the Visual Studio solution: ++ add_td_sources(sources) ++ find_all_header_files(hdrs "${ARG_ADDITIONAL_HEADER_DIRS}") ++ if (hdrs) ++ set_source_files_properties(${hdrs} PROPERTIES HEADER_FILE_ONLY ON) ++ endif() ++ set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON) ++ list(APPEND sources ${ARG_ADDITIONAL_HEADERS} ${hdrs}) + endif() +- set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON) +- list(APPEND sources ${ARG_ADDITIONAL_HEADERS} ${hdrs}) + + set( ${OUT_VAR} ${sources} PARENT_SCOPE ) + endfunction(llvm_process_sources) diff --git a/dev-lang/rust/rust-1.32.0.ebuild b/dev-lang/rust/rust-1.32.0.ebuild index ea00024950f..bc2a6106b8a 100644 --- a/dev-lang/rust/rust-1.32.0.ebuild +++ b/dev-lang/rust/rust-1.32.0.ebuild @@ -63,6 +63,7 @@ S="${WORKDIR}/${MY_P}-src" PATCHES=( "${FILESDIR}"/1.30.1-clippy-sysroot.patch + "${FILESDIR}"/1.32.0-fix-configure-of-bundled-llvm.patch "${FILESDIR}"/1.32.0-system-llvm-7-SIGSEGV.patch )