| 1 |
commit: b5bfb994f73ecef8282a8b34a08857538ca33970 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 15 00:21:20 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 15 00:22:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bfb994 |
| 7 |
|
| 8 |
dev-libs/boost: Use `--no-cmake-config` instead of patch |
| 9 |
|
| 10 |
* Credits go to @pdimov for the suggestion in |
| 11 |
boostorg/python/issues/262 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-libs/boost/boost-1.70.0.ebuild | 5 +++- |
| 17 |
...-1.70.0-fix-python-cmake-duplicate-target.patch | 33 ---------------------- |
| 18 |
2 files changed, 4 insertions(+), 34 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild |
| 21 |
index 6d40a9f7054..68a0140f778 100644 |
| 22 |
--- a/dev-libs/boost/boost-1.70.0.ebuild |
| 23 |
+++ b/dev-libs/boost/boost-1.70.0.ebuild |
| 24 |
@@ -51,7 +51,6 @@ PATCHES=( |
| 25 |
"${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch |
| 26 |
"${FILESDIR}"/${PN}-1.69.0-context-x32.patch |
| 27 |
"${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch |
| 28 |
- "${FILESDIR}"/${PN}-1.70.0-fix-python-cmake-duplicate-target.patch |
| 29 |
) |
| 30 |
|
| 31 |
python_bindings_needed() { |
| 32 |
@@ -174,6 +173,10 @@ src_configure() { |
| 33 |
--boost-build="${EPREFIX}"/usr/share/boost-build |
| 34 |
--prefix="${ED}/usr" |
| 35 |
--layout=system |
| 36 |
+ # CMake has issues working with multiple python impls, |
| 37 |
+ # disable cmake config generation for the time being |
| 38 |
+ # https://github.com/boostorg/python/issues/262#issuecomment-483069294 |
| 39 |
+ --no-cmake-config |
| 40 |
# building with threading=single is currently not possible |
| 41 |
# https://svn.boost.org/trac/boost/ticket/7105 |
| 42 |
threading=multi |
| 43 |
|
| 44 |
diff --git a/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch b/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch |
| 45 |
deleted file mode 100644 |
| 46 |
index c0097a8581b..00000000000 |
| 47 |
--- a/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch |
| 48 |
+++ /dev/null |
| 49 |
@@ -1,33 +0,0 @@ |
| 50 |
-Boost.Build errors out when passing multiple python impls to b2: |
| 51 |
- |
| 52 |
- error: Name clash for '<p/var/tmp/portage/dev-libs/boost-1.70.0/image/usr/lib64/cmake/boost_python-1.70.0>libboost_python-variant-shared.cmake' |
| 53 |
- error: |
| 54 |
- error: Tried to build the target twice, with property sets having |
| 55 |
- error: these incompatible properties: |
| 56 |
- error: |
| 57 |
- error: - <python>2.7 |
| 58 |
- error: - <python>3.6 |
| 59 |
- error: |
| 60 |
- error: Please make sure to have consistent requirements for these |
| 61 |
- error: properties everywhere in your project, especially for install |
| 62 |
- error: targets. |
| 63 |
- |
| 64 |
-https://github.com/boostorg/python/issues/262 |
| 65 |
- |
| 66 |
---- a/tools/boost_install/boost-install.jam |
| 67 |
-+++ b/tools/boost_install/boost-install.jam |
| 68 |
-@@ -870,12 +870,12 @@ |
| 69 |
- |
| 70 |
- $(p).mark-target-as-explicit install-libraries ; |
| 71 |
- |
| 72 |
-- install-cmake-config $(libraries) ; |
| 73 |
-+ # install-cmake-config $(libraries) ; |
| 74 |
- |
| 75 |
- generate install-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>install ; |
| 76 |
- $(p).mark-target-as-explicit install-dependencies ; |
| 77 |
- |
| 78 |
-- alias install : install-libraries install-cmake-config install-dependencies ; |
| 79 |
-+ alias install : install-libraries install-dependencies ; |
| 80 |
- $(p).mark-target-as-explicit install ; |
| 81 |
- |
| 82 |
- # Target stage |
Archives