Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 579328 Details for
Bug 685718
games-strategy/freeorion-0.4.8: fix boost support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix for boost_python
2469.patch (text/plain), 1.85 KB, created by
Oleg
on 2019-06-09 16:21:24 UTC
(
hide
)
Description:
Fix for boost_python
Filename:
MIME Type:
Creator:
Oleg
Created:
2019-06-09 16:21:24 UTC
Size:
1.85 KB
patch
obsolete
>From d579a25038da218f85780151c5bf47e84f198b91 Mon Sep 17 00:00:00 2001 >From: O01eg <o01eg@yandex.ru> >Date: Thu, 6 Jun 2019 21:12:38 +0300 >Subject: [PATCH] Try to find suffixed boost_python > >Some Linux distributives switched to suffixed boost python for versions ><= 1.66. >Use major and minor python version from used python. >--- > CMakeLists.txt | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > >diff --git a/CMakeLists.txt b/CMakeLists.txt >index 927c8c165a..d7694efbd8 100644 >--- a/CMakeLists.txt >+++ b/CMakeLists.txt >@@ -210,10 +210,22 @@ find_package(Boost ${MINIMUM_BOOST_VERSION} > thread > REQUIRED) > if(${Boost_VERSION} GREATER 106699) # boost >= 1.67 >- find_package(Boost COMPONENTS python27 REQUIRED) >- set(Boost_PYTHON_LIBRARY ${Boost_PYTHON27_LIBRARY}) >+ find_package(Boost COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED) >+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}) > else() >- find_package(Boost COMPONENTS python REQUIRED) >+ # boost python suffixes are determined by distributives >+ # try different alternatives >+ find_package(Boost OPTIONAL_COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) >+ if(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND) >+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}) >+ else() >+ find_package(Boost OPTIONAL_COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) >+ if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND) >+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}) >+ else() >+ find_package(Boost COMPONENTS python REQUIRED) >+ endif() >+ endif() > endif() > > find_package(ZLIB REQUIRED)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 685718
:
576168
| 579328