diff --git a/ports/py-lxml/portfile.cmake b/ports/py-lxml/portfile.cmake index 293fdf59..b60f1645 100644 --- a/ports/py-lxml/portfile.cmake +++ b/ports/py-lxml/portfile.cmake @@ -26,6 +26,12 @@ include_dirs=${CURRENT_INSTALLED_DIR}/include;${CURRENT_INSTALLED_DIR}/include/l library_dirs=${LXML_LIB_SHIM_DIR};${CURRENT_INSTALLED_DIR}/lib libraries=${LIBXML2_NAME} ") +else() + # On Linux/macOS lxml's setup detects libxml2/libxslt via pkg-config. Point it + # at vcpkg's installed .pc files (libxml-2.0.pc, libxslt.pc, libexslt.pc) so it + # builds against the vcpkg-provided libraries instead of relying on system + # development packages (which are not present in clean CI images). + set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") endif() vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") diff --git a/ports/py-lxml/vcpkg.json b/ports/py-lxml/vcpkg.json index 90ceee05..b4144ad6 100644 --- a/ports/py-lxml/vcpkg.json +++ b/ports/py-lxml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "py-lxml", "version": "6.1.1", - "port-version": 2, + "port-version": 3, "description": "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.", "homepage": "https://lxml.de/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5f4eafad..f186f69e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "py-lxml": { "baseline": "6.1.1", - "port-version": 2 + "port-version": 3 }, "py-markupsafe": { "baseline": "3.0.3", diff --git a/versions/p-/py-lxml.json b/versions/p-/py-lxml.json index ccc05554..a68a7cb3 100644 --- a/versions/p-/py-lxml.json +++ b/versions/p-/py-lxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b199b3f1464eddea205ef70cafd2c441b7d37ef9", + "version": "6.1.1", + "port-version": 3 + }, { "git-tree": "3b7436d9ca2ecd752e26c05a0d35aa6a127febb1", "version": "6.1.1",