Integrate yaml/pyyaml#731

open-vcpkg · May 13, 2024 · 92ec54e · 92ec54e
1 parent 5db6c9a
commit 92ec54e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/ports/py-pyyaml/cy-me-a-river.patch b/ports/py-pyyaml/cy-me-a-river.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index 65b0ea0..4461580 100644
+--- a/setup.py
++++ b/setup.py
+@@ -82,7 +82,11 @@ if 'sdist' in sys.argv or os.environ.get('PYYAML_FORCE_CYTHON') == '1':
+     with_cython = True
+ try:
+     from Cython.Distutils.extension import Extension as _Extension
+-    from Cython.Distutils import build_ext as _build_ext
++    try:
++        from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
++    except ImportError:
++        from Cython.Distutils import build_ext as _build_ext
++
+     with_cython = True
+ except ImportError:
+     if with_cython:
diff --git a/ports/py-pyyaml/portfile.cmake b/ports/py-pyyaml/portfile.cmake
@@ -3,6 +3,8 @@ vcpkg_from_pythonhosted(
     PACKAGE_NAME    PyYAML
     VERSION         ${VERSION}
     SHA512          94a29924484f557c0966d485c2b70232909253f27fcea9b89e1db1462abf61f2f85d55fbae0177b2bed70eb5daa75813551e868df4df4cddfdee9a87bd08485f
+    PATCHES
+        cy-me-a-river.patch
 )
 
 vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x)