Skip to content
Snippets Groups Projects
Commit 112a7763 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

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
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment