mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +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>
32 lines
765 B
Diff
32 lines
765 B
Diff
From f7439eae9b2f8d91b6689efbf01292a044f3a3fe Mon Sep 17 00:00:00 2001
|
|
From: Osyotr <Osyotr@users.noreply.github.com>
|
|
Date: Thu, 4 Aug 2022 23:49:06 +0300
|
|
Subject: [PATCH 10/11] dont skip rpath
|
|
|
|
---
|
|
configure.ac | 6 ++++++
|
|
1 file changed, 6 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 61b3266..4c2cfb4 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -49,6 +49,14 @@ [$1]
|
|
[RESTORE_ENV]
|
|
)dnl
|
|
|
|
+if test "$ac_sys_system" != "Darwin"; then
|
|
+AS_VAR_IF([GNULD], [yes], [
|
|
+ LDFLAGS="-Wl,--enable-new-dtags,-rpath,$vcpkg_rpath"
|
|
+], [
|
|
+ LDFLAGS="-Wl,-rpath,$vcpkg_rpath"
|
|
+])
|
|
+fi
|
|
+
|
|
dnl PY_CHECK_FUNC(FUNCTION, [INCLUDES], [AC_DEFINE-VAR])
|
|
AC_DEFUN([PY_CHECK_FUNC],
|
|
[ AS_VAR_PUSHDEF([py_var], [ac_cv_func_$1])
|
|
--
|
|
2.37.3.windows.1
|
|
|