mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 02:47:50 +08:00
c6928dfb9e
* [python3] Update to 3.11.3 * Force set PythonForBuild on windows * Set LD_LIBRARY_PATH on unix * Always use vcpkg_find_acquire_program(PYTHON3) on windows * Remove LD_LIBRARY_PATH shenanigans * [vtk] Parse python version from include folder * Fix static builds on windows * Pass --with-build-python on unix * [omniorb] Fix python version in patch * Resurrect rpath patch * [python3] fix usage * [gobject-introspection] don't hardcode python version * Update vcpkg_find_aquire_program(PYTHON3) This is also required for gobject-introspection * [paraview] don't hardcode python version * [vtk-dicom] don't hardcode python version * Update python in vcpkgTools.xml * Fix host arch detection in vcpkg_find_acquire_program(PYTHON3) * [libpq] Don't hardcode python version * [shiva] Don't pass python variables * [vcpkg-get-python-packages] Delete unused file, update hardcoded python version * [python3] update to 3.11.4 * [omniorb] Use PREPEND in vcpkg_add_to_path So that python from vcpkg is picked before system python * libpq quickfix * re-fix libpq * fix vcpkg-get-python-packages * Make windows 7 patch compatible with unix builds * Copy pyd files to bin Also fixes copying files that do not belong to current build tree * Fix static builds * Speculatively fix osx regression * Fix omniorb on unix * [gobject-introspection] fix windows builds * [vtk] Update vendored copy of mpi4py for python 3.11 support * [mdl-sdk] Fix python * [gobject-introspection] fix the fix of a fix... * Update versions * Undo changes in gobject-introspection and vcpkg_find_aquire_program(PYTHON3) --------- Co-authored-by: root <root@DESKTOP-UIPL9V8>
26 lines
831 B
Diff
26 lines
831 B
Diff
diff --git a/configure.ac b/configure.ac
|
|
index a35395e..3c1b3e2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1176,7 +1176,19 @@ fi
|
|
|
|
if test "$with_python" = yes; then
|
|
PGAC_PATH_PYTHON
|
|
- PGAC_CHECK_PYTHON_EMBED_SETUP
|
|
+ python_majorversion=3
|
|
+ python_version=3.REPLACEME
|
|
+ PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed)
|
|
+ python_includespec="${PYTHON_EMBED_CFLAGS}"
|
|
+ python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')]
|
|
+ python_libspec="${PYTHON_EMBED_LIBS}"
|
|
+ python_additional_libs=""
|
|
+ AC_SUBST(python_majorversion)
|
|
+ AC_SUBST(python_version)
|
|
+ AC_SUBST(python_includespec)
|
|
+ AC_SUBST(python_libdir)
|
|
+ AC_SUBST(python_libspec)
|
|
+ AC_SUBST(python_additional_libs)
|
|
fi
|
|
|
|
if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
|