Skip to content
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.

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

better support working with Windows releases of libzmq #1481

Merged
merged 8 commits into from
Jan 25, 2021

Conversation

minrk
Copy link
Member

@minrk minrk commented Jan 22, 2021

  • detect libzmq name with libzmq_name*.dll (matches libzmq-v140-mt-...dll)
  • include zmq-prefix in search path instead of assuming include/lib subdirs(Windows releases have single
    flat include+lib directory)
  • remove our own external-libzmq-dll-bundling hacks (rely on delvewheel to bundle
    non-extension libzmq)
  • add vcruntime-redist to %PATH% if found to ensure it's loaded
  • fetch_libzmq --dll fetches Windows dll release
  • build Windows wheels with public vc140 releases of libzmq
    instead of as an Extension.
    This means Windows wheels will have libsodium instead of tweetnacl
  • set WINVER (maybe doesn't fix anything, at least I couldn't get it to)
  • build on windows-2019

closes #1476
closes #1475

inherit Py_WIN_VER by default unless specified in extra macros

need to always load pyversion_compat for this to work
we don't have source control over libzmq itself to add includes
setting the minimum Windows version explicitly should allow us to pick up the latest compilers

let's find out!
- detect libzmq name with libzmq_name*.dll (matches libzmq-v140-mt-...dll)
- include zmq-prefix in search path (Windows releases have single include+lib directory)
- remove our own libzmq-dll-bundling support (rely on delvewheel to bundle non-extension libzmq)
- add vcruntime-redist to %PATH%
- fetch_libzmq --dll fetches Windows dll release
use bundled libzmq for pypy

since delvewheel doesn't seem to work for the pypy build
@minrk minrk merged commit 02df348 into zeromq:master Jan 25, 2021
@minrk minrk deleted the better-external-libzmq branch January 25, 2021 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant