Skip to content

Linux multiarch #523

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

Jump to bottom
Merged
merged 4 commits into from
Nov 22, 2016
Merged

Linux multiarch #523

merged 4 commits into from
Nov 22, 2016

Conversation

@jagerman
Copy link
Member

@jagerman jagerman commented Nov 22, 2016 •
edited
Loading

This PR supersedes #519 (edit: whoops, not 518) with a few changes to make FindPythonLibsNew work properly on multiarch linux systems.

The main changes:

  • The hard-coded PREFIX/lib and PREFIX/lib64 paths are gone in favour of using just LIBDIR
  • If MULTIARCH is set, we also check LIBDIR/MULTIARCH (before LIBDIR)
  • OS X doesn't need a special case (the non-Windows code now using LIBDIR seems to work perfectly well for OS X for both system and custom python installs)
  • I renamed the PYTHON_LIBRARY_DIR variable to PYTHON_LIBDIR to avoid confusion with Python's package library directory.

@wjakob
Copy link
Member

wjakob commented Nov 22, 2016

This looks great, thank you!

@wjakob wjakob merged commit b7f80ba into pybind:master Nov 22, 2016
@wjakob wjakob mentioned this pull request Nov 22, 2016
Closed
wjakob pushed a commit that referenced this pull request Nov 22, 2016
@jagerman @wjakob
Improve FindPythonLibsNew detection of python library directory (#523)
2ac2d69 
* Use LIBDIR and MULTIARCH on linux to find python library

* Remove apple-specific setting; the non-windows one should work fine on OS X

* Default LIBDIR/MULTIARCH to '' (to avoid getting None)

* Remove trailing whitespace from FindPythonLibsNew
@wjakob
Copy link
Member

wjakob commented Nov 22, 2016

Congratulations on commit 1000 🎉 ;)

@jagerman
Copy link
Member Author

jagerman commented Nov 22, 2016

What happened? I was sure I saw 1001 when I looked a few minutes ago.

@wjakob
Copy link
Member

wjakob commented Nov 22, 2016

I accidentally merged the PyPy WIP ;)

@dean0x7d
Copy link
Member

dean0x7d commented Nov 23, 2016

Thanks @jagerman! Great solution.

zhongxingzhi pushed a commit to zhongxingzhi/pybind11 that referenced this pull request Dec 22, 2016
@jagerman
Improve FindPythonLibsNew detection of python library directory (pybi…
3802ced 
…nd#523)

* Use LIBDIR and MULTIARCH on linux to find python library

* Remove apple-specific setting; the non-windows one should work fine on OS X

* Default LIBDIR/MULTIARCH to '' (to avoid getting None)

* Remove trailing whitespace from FindPythonLibsNew
@rwgk rwgk mentioned this pull request Feb 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jagerman @wjakob @dean0x7d