summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-04-05 07:02:42 +0200
committerMichał Górny <mgorny@gentoo.org>2019-04-05 07:13:19 +0200
commit4b6a6ed19f30f4f30af53b2426c57194626715e7 (patch)
treed1cb51e3caa4f6fa591ba2c6a6fa95318f450c38 /sys-devel/llvm/files
parentapp-emulation/diskimage-builder: 2.21.0 bump (diff)
downloadgentoo-4b6a6ed19f30f4f30af53b2426c57194626715e7.tar.gz
gentoo-4b6a6ed19f30f4f30af53b2426c57194626715e7.tar.bz2
gentoo-4b6a6ed19f30f4f30af53b2426c57194626715e7.zip
sys-devel/llvm: Backport dangling symlink failure fix
Closes: https://bugs.gentoo.org/674662 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-devel/llvm/files')
-rw-r--r--sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch41
1 files changed, 41 insertions, 0 deletions
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
new file mode 100644
index 000000000000..ed83244de53f
--- /dev/null
+++ b/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
@@ -0,0 +1,41 @@
+From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 4 Apr 2019 14:21:38 +0000
+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.
++ if(EXISTS ${file})
++ list(APPEND filtered ${file})
++ endif()
++ endforeach()
++ set(${hdrs_out} ${filtered} PARENT_SCOPE)
+ endfunction(add_header_files_for_glob)
+
+ function(find_all_header_files hdrs_out additional_headerdirs)
+--
+2.21.0
+