Skip to content

setup.py: Use pkgconfig.parse() #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanunderwood merged 2 commits into from
Oct 15, 2020
+16 −29
Merged

setup.py: Use pkgconfig.parse() #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df8b31c
setup.py: Pass Extension build flags with **kwargs
godlygeek Oct 11, 2020
d4ce0de
setup.py: Use pkgconfig.parse()
godlygeek Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 16 additions & 29 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

try:
from pkgconfig import installed as pkgconfig_installed
from pkgconfig import cflags as pkgconfig_cflags
from pkgconfig import libs as pkgconfig_libs
from pkgconfig import parse as pkgconfig_parse
except ImportError:
# pkgconfig is not installed. It will be installed by setup_requires.
pass
Expand All @@ -41,8 +40,7 @@ def pkgconfig_installed_check(lib, required_version, default):
# against the bundled lz4 files, we'll set the compiler flags to be consistent
# with what upstream lz4 recommends.

include_dirs = []
libraries = []
extension_kwargs = {}

lz4version_sources = [
'lz4/_version.c'
Expand All @@ -61,9 +59,9 @@ def pkgconfig_installed_check(lib, required_version, default):
]

if liblz4_found is True:
libraries.append('lz4')
extension_kwargs['libraries'] = ['lz4']
else:
include_dirs.append('lz4libs')
extension_kwargs['include_dirs'] = ['lz4libs']
lz4version_sources.extend(
[
'lz4libs/lz4.c',
Expand Down Expand Up @@ -92,17 +90,18 @@ def pkgconfig_installed_check(lib, required_version, default):

compiler = ccompiler.get_default_compiler()

extra_link_args = []
extra_compile_args = []

if compiler == 'msvc':
extra_compile_args = ['/Ot', '/Wall', '/wd4711', '/wd4820']
extension_kwargs['extra_compile_args'] = [
'/Ot',
'/Wall',
'/wd4711',
'/wd4820',
]
elif compiler in ('unix', 'mingw32'):
if liblz4_found:
extra_link_args.extend(pkgconfig_libs('liblz4').split())
extra_compile_args.extend(pkgconfig_cflags('liblz4').split())
extension_kwargs = pkgconfig_parse('liblz4')
else:
extra_compile_args = [
extension_kwargs['extra_compile_args'] = [
'-O3',
'-Wall',
'-Wundef'
Expand All @@ -113,31 +112,19 @@ def pkgconfig_installed_check(lib, required_version, default):

lz4version = Extension('lz4._version',
lz4version_sources,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
libraries=libraries,
include_dirs=include_dirs)
**extension_kwargs)

lz4block = Extension('lz4.block._block',
lz4block_sources,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
libraries=libraries,
include_dirs=include_dirs)
**extension_kwargs)

lz4frame = Extension('lz4.frame._frame',
lz4frame_sources,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
libraries=libraries,
include_dirs=include_dirs)
**extension_kwargs)

lz4stream = Extension('lz4.stream._stream',
lz4stream_sources,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
libraries=libraries,
include_dirs=include_dirs)
**extension_kwargs)

install_requires = []

Expand Down