mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 10:27:53 +08:00
5599ae4ccf
* [python3] Make patch files contiguous. When applying these back to the python3 repository and re-formatting, the gap in patch file numbers requires annoying manual renaming. Debunk that. * [python3] Use patch files, not diffs. Diffs require multiple steps to import into the python3 repository. Debunk that. The patch format retains authorship information. * [python3] Fix problems with conflicting patches. Something modified in the static library patch was being used as a context line in a later patch. How did this pass CI? * [python3] Bump to 3.10.7. * [python3] Fix Windows 7 patch. * [python3] Back out trivial patch changes. * [python3] Apply unconditional patches first. * version things and stuff * Bump Python tools to 3.10.7.
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From a45e64a57c58a9fe4984b866e86c7b661da7940d Mon Sep 17 00:00:00 2001
|
|
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
|
|
Date: Mon, 14 Mar 2022 09:09:48 +0100
|
|
Subject: [PATCH 09/11] bz2d
|
|
|
|
fix bz2(d) search on linux (#23525)
|
|
---
|
|
setup.py | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 43e807f20..df4d43d3d 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1741,6 +1741,14 @@ def detect_compress_exts(self):
|
|
self.add(Extension('_bz2', ['_bz2module.c'],
|
|
libraries=['bz2'],
|
|
extra_link_args=bz2_extra_link_args))
|
|
+ elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')):
|
|
+ if MACOS:
|
|
+ bz2_extra_link_args = ('-Wl,-search_paths_first',)
|
|
+ else:
|
|
+ bz2_extra_link_args = ()
|
|
+ self.add(Extension('_bz2', ['_bz2module.c'],
|
|
+ libraries=['bz2d'],
|
|
+ extra_link_args=bz2_extra_link_args))
|
|
else:
|
|
self.missing.append('_bz2')
|
|
|
|
--
|
|
2.37.3.windows.1
|
|
|