| 1 |
commit: 5c39e60eb1090bb54f673f7ab03eb8edaecf32e3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 5 18:36:13 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 5 18:48:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c39e60e |
| 7 |
|
| 8 |
sys-libs/libcxx: Backport libsupc++ build fix to 7.0.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/667174 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/libcxx-7.0.0-libsupcxx-install.patch | 32 ++++++++++++++++++++++ |
| 14 |
sys-libs/libcxx/libcxx-7.0.0.ebuild | 4 +++ |
| 15 |
2 files changed, 36 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch b/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..35b04e253e6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch |
| 22 |
@@ -0,0 +1,32 @@ |
| 23 |
+From 84f960980e5bbaf136bc130cb385379b8f610335 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Petr Hosek <phosek@××××××××.org> |
| 25 |
+Date: Thu, 4 Oct 2018 05:38:53 +0000 |
| 26 |
+Subject: [PATCH] [CMake] Use just basename when copying C++ ABI headers |
| 27 |
+ |
| 28 |
+This avoids duplicate directories when the filename includes path. |
| 29 |
+ |
| 30 |
+Fixes PR39145 |
| 31 |
+ |
| 32 |
+Differential Revision: https://reviews.llvm.org/D52762 |
| 33 |
+ |
| 34 |
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@343753 91177308-0d34-0410-b5e6-96231b3b80d8 |
| 35 |
+--- |
| 36 |
+ cmake/Modules/HandleLibCXXABI.cmake | 2 +- |
| 37 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 38 |
+ |
| 39 |
+diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake |
| 40 |
+index ef3b4f5dd..1c19d7e01 100644 |
| 41 |
+--- a/cmake/Modules/HandleLibCXXABI.cmake |
| 42 |
++++ b/cmake/Modules/HandleLibCXXABI.cmake |
| 43 |
+@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) |
| 44 |
+ get_filename_component(ifile ${fpath} NAME) |
| 45 |
+ set(src ${incpath}/${fpath}) |
| 46 |
+ |
| 47 |
+- set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath}) |
| 48 |
++ set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${ifile}) |
| 49 |
+ add_custom_command(OUTPUT ${dst} |
| 50 |
+ DEPENDS ${src} |
| 51 |
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} |
| 52 |
+-- |
| 53 |
+2.19.0 |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/sys-libs/libcxx/libcxx-7.0.0.ebuild b/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 57 |
index d94f0c1c617..790f5dc1221 100644 |
| 58 |
--- a/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 59 |
+++ b/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 60 |
@@ -46,6 +46,10 @@ PATCHES=( |
| 61 |
# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
| 62 |
# out-of-tree build. |
| 63 |
"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
| 64 |
+ |
| 65 |
+ # Fix installing when using libsupc++ backend. |
| 66 |
+ # https://bugs.gentoo.org/667174 |
| 67 |
+ "${FILESDIR}/${PN}-7.0.0-libsupcxx-install.patch" |
| 68 |
) |
| 69 |
|
| 70 |
# least intrusive of all |
Archives