Skip to content

Work around a broken shared detection on some platforms #300

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
merged 6 commits into from
Dec 7, 2016
Merged

Work around a broken shared detection on some platforms #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64dba41
Update setup.py
Dec 4, 2016
c17f38f
Update setup.py
Dec 7, 2016
c86ba2f
Update setup.py
Dec 7, 2016
a1d5849
Update setup.py
Dec 7, 2016
bd07eb0
Update .travis.yml
Dec 7, 2016
a5f7b5a
Small cleanup.
filmor Dec 7, 2016
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: required
language: python
python:
- 2.6
- 2.7
- 3.2
- 3.4
Expand Down
10 changes: 8 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from distutils.spawn import find_executable
from distutils import log
from platform import architecture
from subprocess import Popen, CalledProcessError, PIPE, check_call
from subprocess import Popen, CalledProcessError, PIPE, check_call, check_output
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@denfromufa Did you try using _check_output instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, but what is the difference?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the exact same thing 😄. Atleast it sounds like _check_output was copied from py27 so that earlier version (py26) could use it. I'm reviewing the changes we can make after dropping old python versions and noticed your code.

from glob import glob
import fnmatch
import sys
Expand Down Expand Up @@ -153,7 +153,13 @@ def build_extension(self, ext):

# Check if --enable-shared was set when Python was built
enable_shared = get_config_var("Py_ENABLE_SHARED")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

capital "y" as in PY_ENABLE_SHARED?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/python/cpython/search?utf8=%E2%9C%93&q=Py_ENABLE_SHARED

if enable_shared == 0:
if enable_shared:
# Double-check if libpython is linked dynamically with python
lddout = check_output(["ldd", sys.executable])
if b'libpython' not in lddout:
enable_shared = False

if not enable_shared:
defines.append("PYTHON_WITHOUT_ENABLE_SHARED")

if hasattr(sys, "abiflags"):
Expand Down