Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions ports/python2/008-bz2d.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/setup.py b/setup.py
index f764223..d6a58e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1506,6 +1506,14 @@ class PyBuildExt(build_ext):
exts.append( Extension('bz2', ['bz2module.c'],
libraries = ['bz2'],
extra_link_args = bz2_extra_link_args) )
+ elif (self.compiler.find_library_file(lib_dirs, 'bz2d')):
+ if host_platform == "darwin":
+ bz2_extra_link_args = ('-Wl,-search_paths_first',)
+ else:
+ bz2_extra_link_args = ()
+ exts.append( Extension('bz2', ['bz2module.c'],
+ libraries=['bz2d'],
+ extra_link_args = bz2_extra_link_args) )
else:
missing.append('bz2')

4 changes: 4 additions & 0 deletions ports/python2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ if (VCPKG_TARGET_IS_WINDOWS)
list(APPEND _PYTHON_PATCHES
${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch
)
else()
list(APPEND _PYTHON_PATCHES
${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch
)
endif()


Expand Down
2 changes: 1 addition & 1 deletion ports/python2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "python2",
"version": "2.7.18",
"port-version": 3,
"port-version": 4,
"description": "The Python programming language as an embeddable library",
"homepage": "https://www.python.org",
"license": "Python-2.0"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5578,7 +5578,7 @@
},
"python2": {
"baseline": "2.7.18",
"port-version": 3
"port-version": 4
},
"python3": {
"baseline": "3.10.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/python2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13",
"version": "2.7.18",
"port-version": 4
},
{
"git-tree": "2a9fb7f96d762e213e9901452492aee00f6fe049",
"version": "2.7.18",
Expand Down