Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.extension
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.extension
Commits
112a7763
Commit
112a7763
authored
3 years ago
by
André Anjos
Browse files
Options
Downloads
Plain Diff
Merge branch 'boost-conda-forge' into 'master'
[boost] Add support for libboost_python38.so filename format Closes
#80
See merge request
!132
parents
8a2436e1
62a49ea9
No related branches found
No related tags found
1 merge request
!132
[boost] Add support for libboost_python38.so filename format
Pipeline
#54610
passed
3 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bob/extension/boost.py
+7
-2
7 additions, 2 deletions
bob/extension/boost.py
with
7 additions
and
2 deletions
bob/extension/boost.py
+
7
−
2
View file @
112a7763
...
...
@@ -103,7 +103,7 @@ class boost:
def
libconfig
(
self
,
modules
,
only_static
=
False
,
templates
=
[
'
boost_%(name)s-mt-%(py)s
'
,
'
boost_%(name)s-%(py)s
'
,
'
boost_%(name)s-mt
'
,
'
boost_%(name)s
'
]):
templates
=
[
'
boost_%(name)s-mt-%(py)s
'
,
'
boost_%(name)s-%(py)s
'
,
'
boost_%(name)s%(pyv)s
'
,
'
boost_%(name)s-mt
'
,
'
boost_%(name)s
'
]):
"""
Returns a tuple containing the library configuration for requested
modules.
...
...
@@ -139,6 +139,10 @@ class boost:
resolves to the string ``
'
pyXY
'
`` where ``XY`` represent the major and
minor versions of the current python interpreter.
%(pyv)s
resolves to the string ``
'
XY
'
`` where ``XY`` represent the major and
minor versions of the current python interpreter.
Example templates:
* ``
'
boost_%(name)s-mt
'
``
...
...
@@ -158,11 +162,12 @@ class boost:
prefix
=
os
.
path
.
dirname
(
self
.
include_directory
)
py
=
'
py%d%d
'
%
sys
.
version_info
[:
2
]
pyv
=
'
%d%d
'
%
sys
.
version_info
[:
2
]
filenames
=
[]
for
module
in
modules
:
candidates
=
[]
modnames
=
[
k
%
dict
(
name
=
module
,
ver
=
self
.
version
,
py
=
py
)
for
k
in
modnames
=
[
k
%
dict
(
name
=
module
,
ver
=
self
.
version
,
py
=
py
,
pyv
=
pyv
)
for
k
in
templates
]
for
modname
in
modnames
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment