jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged RC_1_2 into RC_2_0

Browse Source
This commit is contained in:
arvidn
2022-09-09 11:04:41 +02:00
parent 268e37f5ad b5873f23b4
commit e17fdee2ed
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cibuildwheel.yml vendored
View File

@ -103,7 +103,7 @@ jobs:
- uses: docker/setup-qemu-action@v1 - uses: docker/setup-qemu-action@v1
if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux' if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux'
- uses: pypa/cibuildwheel@v2.2.2 - uses: pypa/cibuildwheel@v2.9.0
if: steps.cache-wheel.outputs.cache-hit != 'true' if: steps.cache-wheel.outputs.cache-hit != 'true'
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2

1
.github/workflows/python.yml vendored
View File

@ -29,7 +29,6 @@ jobs:
run: | run: |
brew update brew update
brew install boost-build boost boost-python3 python@3.10 openssl@1.1 brew install boost-build boost boost-python3 python@3.10 openssl@1.1
echo "using darwin ;" >>~/user-config.jam
export PATH=$(brew --prefix)/opt/python@3.10/bin:$PATH export PATH=$(brew --prefix)/opt/python@3.10/bin:$PATH
- name: update package lists (linux) - name: update package lists (linux)

10
bindings/python/setup.py
View File

@ -358,6 +358,12 @@ class LibtorrentBuildExt(build_ext_lib.build_ext):
self._maybe_add_arg("--debug-building") self._maybe_add_arg("--debug-building")
self._maybe_add_arg("--debug-generators") self._maybe_add_arg("--debug-generators")
if sys.platform == "darwin":
# boost.build defaults to toolset=clang on mac. However python.jam
# on boost 1.77+ breaks with toolset=clang if using a framework-type
# python installation, such as installed by homebrew.
self._maybe_add_arg("toolset=darwin")
# Default feature configuration # Default feature configuration
self._maybe_add_arg("deprecated-functions=on") self._maybe_add_arg("deprecated-functions=on")
self._maybe_add_arg("boost-link=static") self._maybe_add_arg("boost-link=static")
@ -367,7 +373,7 @@ class LibtorrentBuildExt(build_ext_lib.build_ext):
variant = "debug" if self.debug else "release" variant = "debug" if self.debug else "release"
self._maybe_add_arg(f"variant={variant}") self._maybe_add_arg(f"variant={variant}")
bits = 64 if sys.maxsize > 2 ** 32 else 32 bits = 64 if sys.maxsize > 2**32 else 32
self._maybe_add_arg(f"address-model={bits}") self._maybe_add_arg(f"address-model={bits}")
# Cross-compiling logic: tricky, because autodetection is usually # Cross-compiling logic: tricky, because autodetection is usually
@ -447,7 +453,7 @@ class LibtorrentBuildExt(build_ext_lib.build_ext):
yield yield
class InstallDataToLibDir(install_data_lib.install_data): # type: ignore class InstallDataToLibDir(install_data_lib.install_data):
def finalize_options(self) -> None: def finalize_options(self) -> None:
# install_data installs to the *base* directory, which is useless. # install_data installs to the *base* directory, which is useless.
# Nothing ever gets installed there, no tools search there. You could # Nothing ever gets installed there, no tools search there. You could

2
pyproject.toml
View File

@ -2,7 +2,7 @@
requires-python = ">=3.7" requires-python = ">=3.7"
[tool.cibuildwheel] [tool.cibuildwheel]
skip = "pp*" skip = "{pp*,cp311-*}"
[tool.cibuildwheel.macos] [tool.cibuildwheel.macos]
before-all = [ before-all = [