Commit Graph

811 Commits

Author SHA1 Message Date
Javier Matos Denizac
7ebd64e6bb
[vcpkg_find_acquire(NASM).cmake] add nasm mirror (#38597)
depends on https://github.com/vcpkg/vcpkg.github.io/pull/161

Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local>
2024-05-09 13:07:20 -07:00
Kai Pastor
a59ba45e60
[vcpkg-scripts] Fix rpath fixup; add test (#37964)
Fix fixup for debug tools,
https://github.com/microsoft/vcpkg/pull/37736#issuecomment-2035415913.
Fix fixup for paths with regex chars,
https://github.com/microsoft/vcpkg/issues/37984.
2024-04-23 15:09:16 -04:00
Alexander Neumann
9224b3bbd8
[vcpkg/scripts] Only add pkgconfig_path if it is not already on PATH (#38239)
closes #37213
2024-04-20 16:20:27 -04:00
Kai Pastor
8455223c87
[vcpkg scripts] Update msys2 pkgconf to 2.2.0 (#37844)
Should fix #37213.
2024-04-01 13:37:39 -07:00
Alexander Neumann
56db88cd3b
[scripts] fix vcpkg_configure_meson (#37396) 2024-03-15 18:20:05 -07:00
Alexander Neumann
a664e41ee5
[vcpkg-tool-meson] Update meson to 1.3.2 (#28084) 2024-03-11 14:09:15 -07:00
Billy O'Neal
e38b936343
Allow uname calls in download mode + Fix handling of files without RPATH (#37129)
... and don't fetch patchelf unless we actually need it. For example
cmake helper ports have no need to fetch patchelf.

In https://github.com/microsoft/vcpkg/pull/36056 , things were changed
to unconditionally patchelf when targeting Linux. Unfortunately that
broke --only-downloads a lot of the time. This fixes that.

Also contains @Osyotr 's fixes from
https://github.com/microsoft/vcpkg/pull/37190 to coalesce world rebuilds
a bit, so repeating comments from there:

Fixes https://github.com/microsoft/vcpkg/issues/37183
Towards https://github.com/microsoft/vcpkg/issues/25668
2024-03-07 15:19:17 -08:00
Billy O'Neal
d816079874
[vcpkg_from_git] Improve diagnostics. (#36539)
While authoring vcpkg_from_git to authenticated servers documentation,
@JavierMatosD and I discovered some failure modes that are not clear in
the output.

Example with REF set to a branch name:

```console
The port under test is:
vcpkg_from_git(
    OUT_SOURCE_PATH out
    URL https://github.com/microsoft/vcpkg
    REF 2024.01.12
)
========== BEFORE ===============
Computing installation plan...
The following packages will be built and installed:
    test-port:x64-windows@1 -- D:\test\test-port
Detecting compiler hash for triplet x64-windows...
Installing 1/1 test-port:x64-windows@1...
Building test-port:x64-windows@1...
-- Installing port from location: D:\test\test-port
-- Fetching https://github.com/microsoft/vcpkg 2024.01.12...
CMake Error at scripts/cmake/vcpkg_from_git.cmake:141 (message):
  unable to rev-parse 2024.01.12 after fetching git repository
Call Stack (most recent call first):
  D:/test/test-port/portfile.cmake:1 (vcpkg_from_git)
  scripts/ports.cmake:170 (include)

error: building test-port:x64-windows failed with: BUILD_FAILED
Elapsed time to handle test-port:x64-windows: 1.8 s
Please ensure you're using the latest port files with `git pull` and `vcpkg update`.
Then check for known issues at:
  https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+in%3Atitle+test-port
You can submit a new issue at:
  https://github.com/microsoft/vcpkg/issues/new?title=[test-port]+Build+error+on+x64-windows&body=Copy+issue+body+from+D%3A%2Fvcpkg2%2Finstalled%2Fvcpkg%2Fissue_body.md

========== AFTER ================
Computing installation plan...
The following packages will be built and installed:
    test-port:x64-windows@1 -- D:\test\test-port
Detecting compiler hash for triplet x64-windows...
Installing 1/1 test-port:x64-windows@1...
Building test-port:x64-windows@1...
-- Installing port from location: D:\test\test-port
-- Fetching https://github.com/microsoft/vcpkg 2024.01.12...
CMake Error at scripts/cmake/vcpkg_from_git.cmake:142 (message):
  After fetching 2024.01.12, the target ref 2024.01.12 appears inaccessible.
  A common cause of this failure is setting REF to a named branch or tag
  rather than a commit SHA.  REF must be a commit SHA.  If the git server
  does not advertise commit SHAs (uploadpack.allowReachableSHA1InWant is
  false), you can set FETCH_REF to a named branch in which the desired commit
  SHA is in the history.  For example, you may be able to fix this error by
  changing "REF 2024.01.12" to "REF a-commit-sha FETCH_REF 2024.01.12".  (git
  rev-parse 2024.01.12 failed)
Call Stack (most recent call first):
  D:/test/test-port/portfile.cmake:1 (vcpkg_from_git)
  scripts/ports.cmake:170 (include)

error: building test-port:x64-windows failed with: BUILD_FAILED
Elapsed time to handle test-port:x64-windows: 1.9 s
Please ensure you're using the latest port files with `git pull` and `vcpkg update`.
Then check for known issues at:
  https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+in%3Atitle+test-port
You can submit a new issue at:
  https://github.com/microsoft/vcpkg/issues/new?title=[test-port]+Build+error+on+x64-windows&body=Copy+issue+body+from+D%3A%2Fvcpkg%2Finstalled%2Fvcpkg%2Fissue_body.md
```

Example with REF ste to a branch name with FETCH_REF set:

```console
PS D:\test> run-test
The following packages are not installed:
    test-port:x64-windows
The following packages are not installed:
    test-port:x64-windows
The port under test is:
vcpkg_from_git(
    OUT_SOURCE_PATH out
    URL https://github.com/microsoft/vcpkg
    REF 2024.01.12
    FETCH_REF master
)
========== BEFORE ===============
Computing installation plan...
The following packages will be built and installed:
    test-port:x64-windows@1 -- D:\test\test-port
Detecting compiler hash for triplet x64-windows...
Installing 1/1 test-port:x64-windows@1...
Building test-port:x64-windows@1...
-- Installing port from location: D:\test\test-port
-- Fetching https://github.com/microsoft/vcpkg master...
CMake Error at scripts/cmake/vcpkg_from_git.cmake:141 (message):
  unable to rev-parse 2024.01.12 after fetching git repository
Call Stack (most recent call first):
  D:/test/test-port/portfile.cmake:1 (vcpkg_from_git)
  scripts/ports.cmake:170 (include)

error: building test-port:x64-windows failed with: BUILD_FAILED
Elapsed time to handle test-port:x64-windows: 1.6 s
Please ensure you're using the latest port files with `git pull` and `vcpkg update`.
Then check for known issues at:
  https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+in%3Atitle+test-port
You can submit a new issue at:
  https://github.com/microsoft/vcpkg/issues/new?title=[test-port]+Build+error+on+x64-windows&body=Copy+issue+body+from+D%3A%2Fvcpkg2%2Finstalled%2Fvcpkg%2Fissue_body.md

========== AFTER ================
Computing installation plan...
The following packages will be built and installed:
    test-port:x64-windows@1 -- D:\test\test-port
Detecting compiler hash for triplet x64-windows...
Installing 1/1 test-port:x64-windows@1...
Building test-port:x64-windows@1...
-- Installing port from location: D:\test\test-port
-- Fetching https://github.com/microsoft/vcpkg master...
CMake Error at scripts/cmake/vcpkg_from_git.cmake:138 (message):
  After fetching master, the target ref 2024.01.12 appears inaccessible.  A
  common cause of this failure is setting REF to a named branch or tag rather
  than a commit SHA.  REF must be a commit SHA.  (git rev-parse 2024.01.12
  failed)
Call Stack (most recent call first):
  D:/test/test-port/portfile.cmake:1 (vcpkg_from_git)
  scripts/ports.cmake:170 (include)

error: building test-port:x64-windows failed with: BUILD_FAILED
Elapsed time to handle test-port:x64-windows: 1.5 s
Please ensure you're using the latest port files with `git pull` and `vcpkg update`.
Then check for known issues at:
  https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+in%3Atitle+test-port
You can submit a new issue at:
  https://github.com/microsoft/vcpkg/issues/new?title=[test-port]+Build+error+on+x64-windows&body=Copy+issue+body+from+D%3A%2Fvcpkg%2Finstalled%2Fvcpkg%2Fissue_body.md
```

---------

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2024-03-06 11:28:35 -08:00
Osyotr
e76d097722
[python3] Update to 3.11.8 (#36755)
Fixes #36736

Changes: https://github.com/python/cpython/compare/v3.11.5...v3.11.8
2024-03-05 01:29:47 -08:00
Kai Pastor
215a253559
[z_vcpkg_setup_pkgconfig_path] debug needs share/pkgconfig (#36151)
Pass `share/pkgconfig` instead of `debug/share/pkgconfig`: The `share`
location is for config-independent data.
Integrate `CURRENT_PACKAGES_DIR` locations.
Change the function interface to take a CONFIG parameter instead of
prefix list (suggested below).
Use `z_vcpkg_setup_pkgconfig_path` also for `vcpkg_fixup_pkgconfig`
(which already had proper handling of `CURRENT_PACKAGES_DIR` and
`share`).
Remove redundant trailing slash.
Extend unit test.

Fixes consuming `wayland-protocols` and similar.
2024-03-01 16:35:37 -08:00
Alexander Neumann
2ac6ba173b
Refine rpath fixup to inspect already existing rpaths (#36056)
Reason:
```
-- Adjusting original rpath of: '/mnt/e/all/vcpkg/installed/x64-linux-release/lib/pkgconfig/../../lib/intel64/'
-- Fixed rpath in: '/mnt/e/all/vcpkg/packages/numpy_x64-linux-release/lib/python3.11/site-packages/numpy/linalg/lapack_lite.cpython-311-x86_64-linux-gnu.so' ('$ORIGIN:$ORIGIN/../../../../:$ORIGIN/../../../../intel64/')

```
needed `$ORIGIN/../../../../intel64/` in there which came from a pc file
via `-Wl,-rpath='${libdir}'`

---------

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>
2024-02-28 18:24:48 -08:00
Kai Pastor
523d1b4811
[vcpkg baseline][vcpkg scripts] Drop ${pc_sysrootdir} (#36843)
Fixes xcb-util-errors baseline regression.
2024-02-21 21:59:11 -08:00
Kai Pastor
eb1696a7f9
[vcpkg scripts] Rollback msys2 autoconf 2.71 (#36774)
Fix gmp regression.
Fixes #36639.
Fixes #36651.
2024-02-16 13:42:32 -08:00
Kai Pastor
212d57331c
[vcpkg baseline][vcpkg-ci-msys2] Update msys2 (#36548)
* Limit CI

* Update msys2

* Declare msys packages for pkgconfig and fortran...

... with explicit DEPS and PROVIDES, instead of using DIRECT_PACKAGES.
This change makes it possible to notice changed dependencies
in `vcpkg-ci-msys2` update checks. (Current case: zstd.)
It also enables reuse of general declarations from `vcpkg_acquire_msys`
in specialized cases (`vpckg_find_fortran`).

Last not least, using the the Z_DECLARE_EXTRA_PACKAGES_COMMAND
simplifies the implementation of `vcpkg-ci-msys2`, in particular for
checks across platform boundaries.

* Revert "Limit CI"
2024-02-06 13:13:41 -08:00
MonicaLiu
984698f5f0
[7zip] Switch download source to github (#36228)
* Switch download source to github

* update version

* add both urls

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
Co-authored-by: Javier Matos Denizac <javiermat@microsoft.com>
2024-01-24 09:57:01 -08:00
Kai Pastor
b2f8426094
[vcpkg_configure_make] Misc fixes (#31228)
* Fix lib suffix matching

* Preserve flags when transforming standard libs

* Use separate_arguments

* Fix transform

* [vcpkg_configure_make] Fix SKIP_CONFIGURE

* Update linker flags

* Update linker flags

* Fix regex substitution

* Restore full CI

* Reuse configure's linker flags setup

* Handle ldflags separately from linker flags

* Factor out common definitions

* Control docdir and mandir for debug

* Use vcpkg_list APPEND

* Don't pass -avoid-version into configure

* Restore lost escaping

* Copy --target from LDFLAGS to CC/CXX

* Consolidate macros into one function

* Elaborate ABI flags

* Elaborate flag processing

* Update warnings for embedded space

* Update windows tool path fixup

* [libudns] No cross builds

* [vcpkg_find_acquire_program] Add VSCLANG

Find VS's clang without fallback to the giant LLVM download.

* [gmp] Update CCAS setup

* [nettle] Update CCAS setup

* Fix VSCLANG

* WIP

* Restore processing of isysroot

* [nettle] Fix assembler option

* [liburing] Adjust

* Variable name changes

* Remove redundant separate arguments

* Move -m32/-m64 to ABI flags

* Unify ABIFLAGS spelling

* CI

* Revert VSCLANG

* Use GNU Make to build autotools ports on FreeBSD (microsoft/vcpkg#32282)

* Fix flag removal

* Drop separation of ABI flags

* Handle '-arch=...'

* Revert "Control docdir and mandir for debug"

This reverts commit d8293a1997.

* [icu] Pass uwp option to pkgdata

* Restore old osx flags hook

* Add triplet variable to make libtool pass --target to linker

---------

Co-authored-by: Schaich, Alonso <alonsoschaich@fastmail.fm>
2024-01-23 13:27:46 -08:00
Alexander Neumann
02286a84c7
Run python in isolate mode (#35990)
* Run python in isolate mode.

* v db
2024-01-11 15:32:36 -08:00
autoantwort
62a471f006
vcpkg_find_acquire_program(BISON).cmake: Also search default brew installation on arm64-osx (#35765) 2023-12-19 16:49:46 -08:00
Paweł Wegner
7fb97764bc
[scripts] Download arm64 python when host is arm64 on windows. (#34354) 2023-12-08 01:25:03 -08:00
Kai Pastor
11817569c0
[vcpkg-scripts] Update msys2, add x64 PKGCONFIG (#35331)
* [vcpkg-scripts] Update msys2

* Don't update to pkgconf 2.0

* Missed SHA

* Limit CI

* [vcpkg_find_acquire_program] Update PKGCONFIG to 2.1.0

* Update msys2

* Fixup

* Revert "Limit CI"

This reverts commit aa270376df.

* Fix PKGCONFIG program version

* Add x64 pkgconf
2023-11-28 22:45:03 -08:00
Kai Pastor
516147648a
[vcpkg_find_acquire_program] Find pkg-config in /opt/homebrew/bin (#34776)
* [vcpkg_find_acquire_program(PKGCONFIG)] /opt/homebrew/bin

* PREPEND arm osx path
2023-11-27 16:54:46 -08:00
Billy O'Neal
83712a6060
Improve and extract internals of vcpkg_find_acquire_program. (#34881)
* Extract vcpkg_extract_archive from vcpkg_find_acquire_program.

* Extract vcpkg_download_sourceforge from vcpkg_from_sourceforge.

This allows vcpkg_find_acquire_program to download from SourceForge without needing to temporarily change _VCPKG_EDITABLE.

* Use whether a URI is known for an entity to decide whether to downloads it rather than checking a separate supported_on_unix boolean.

* Add unparsed arguments check to vcpkg_extract_archive
2023-11-14 14:01:08 -08:00
Victor Nivet
9f03078bdc
[vcpkg_configure_make] fix case sensitive comparison in PATH system d… (#34791)
* [vcpkg_configure_make] fix case sensitive comparison in PATH system dir search

* Fixes after code review

---------

Co-authored-by: Victor NIVET <vnivet@invoke.fr>
2023-11-03 11:01:20 -07:00
LE GARREC Vincent
681e510ff1
[vcpkg] Fix GitLab authentication token (#34151) 2023-10-06 16:47:19 -07:00
Kai Pastor
366ebd7726
Update jom to 1.1.4 (#34090) 2023-10-02 21:01:36 -07:00
Henrik Gaßmann
9648982d40
[find_acquire_program(GO)] Update to version 1.21.1 (#34011) 2023-09-25 13:44:52 -07:00
Billy O'Neal
08cc145ed5
[perl] Update strawberry perl to 5.38.0.1 and switch to GitHub. (#33854)
Resolves https://github.com/microsoft/vcpkg/issues/28288
2023-09-25 11:20:23 -07:00
Henrik Gaßmann
f07179ba1a
fix: Make from_gitlab work with nested subgroups (#33736)
Don't enforce a hardcoded nesting limit as these limits are enforced by
GitLab itself and may change in the future. Furthermore I believe that
users can be trusted to successfully copy'n'paste the path portion of an
URL. Therefore we just require that the assumptions of our
implementation hold, i.e. that we can convert the repo path to a CMake
list by replacing `/` with `;` and that there is a repository name.
2023-09-22 16:01:33 -07:00
Osyotr
e4b4469611
[python3] Update to 3.11.5 (#33477) 2023-09-07 13:12:03 -07:00
Alexander Neumann
82c68e296d
[7zip] Update to 23.01 (#33437)
* update all 7zip related stuff

* v db

* remove unnecessary line from testing

* fix 7zip build

* v db
2023-08-30 13:43:31 -07:00
Henrik Gaßmann
24118478f3
[vcpkg] Enhance detection of AV messing with builds (#33279)
The current error message matching attempt is too strict as the error
message occasionally spells out the extension (i.e. `mt.exe` instead of
`mt`).

Co-authored-by: Monica <liuyumei01@beyondsoft.com>
2023-08-29 00:18:59 -07:00
Osyotr
c6928dfb9e
[python3] Update to 3.11.4 (#31727)
* [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>
2023-08-07 13:19:53 -07:00
Theodore Tsirpanis
fe1369ae90
[vcpkg-find-acquire-program] Add mirror to nasm. (#32806)
* Add mirror to nasm.

See https://github.com/microsoft/vcpkg/issues/2777#issuecomment-1639755074.

* Use mirror from gstreamer.freedesktop.org.
2023-08-07 13:08:17 -07:00
Billy O'Neal
08f00b4f01
scripts/msys => scripts/cmake (#32375)
* scripts/msys => scripts/cmake

The "msys" directory looked like a "maintainer help" directory (like scripts/boost is) so it wasn't included in standalone distributions of vcpkg.

It seems like the correct fix for this is just to move it into the scripts/cmake directory.
2023-07-27 13:19:40 -07:00
Alexander Neumann
e65af7bb5c
[vcpkg_configure_make] Fix serious case of WINDOWS yelling at you 2023-07-26 11:04:33 -07:00
JonLiu1993
a564a7e2a5
[vcpkg scripts] Fix check the different features have the same feature variable in function vcpkg_check_features (#31984) 2023-07-21 09:04:10 -07:00
Kai Pastor
517c8dc2f6
[z_vcpkg_apply_patches] core.filemode=true (#32392) 2023-07-06 11:28:54 -07:00
Kai Pastor
66444e13a8
[vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64 (#31924)
* [vcpkg-ci-msys2] Add clangarm64 support

UCRT binaries for ARM64, built with clang.

* [vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64

* CI
2023-06-12 16:31:42 -07:00
Kai Pastor
ef97891996
[vcpkg_find_fortran] Update msys2 packages (#31926)
* [vcpkg_find_fortran] Update msys2 packages

* [vcpkg-ci-msys2] Process x86 gfortran on x64
2023-06-12 16:29:54 -07:00
Billy O'Neal
638b1588be
Update vcpkg-tool to 2023-06-07 + xbox triplets cleanup (#31723)
* Update vcpkg-tool to 2023-05-31 + xbox triplets cleanup

https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-30 +
https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-31 +
https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-07

Clean up xbox triplets following teaching vcpkg.exe about xbox more directly.

Also deletes the seemingly-no-longer-used vcpkg_get_dep_info.cmake and vcpkg_get_tags.cmake.

Also: [redis-plus-plus] Add DISABLE_PARALLEL_CONFIGURE due to source tree write.
2023-06-08 11:17:29 -07:00
Kai Pastor
1c5a340f6e
[vcpkg_acquire_msys,vcpkg-ci-msys2] Ensure msys2 package list freshness (#29067)
* [vcpkg-ci-msys2] New test port for msys2 freshness

* Add features for script updates

* Remove duplicate libbz2 entry

* Automatically update all msys packages, add autoconf-wrapper

* Update primary URL and mirrors

* Follow repo renames

* Fix dependencies of 'file'

* Resolve dependencies at runtime

Don't require msys2 packages to be order from dependent to independent.
This allows to directly use the packages official dependencies, even
if they contain cycles.
It also allows to maintain a stable alphabetical order of the package
declarations, even if the dependencies change over time. This helps to
avoid duplicate declaration.

* Fix updating

* [gettext] Preset more MSVC checks

* Update msys2 packages

* gettext fixes

* CI

* Simplify: Remove update-critical

Desired changes can be picked in git gui etc..

* PKGCONFIG moved

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-05-28 23:24:09 -07:00
autoantwort
a0a828827b
[libgpg-error] fix arm64 build | [configure_make] fix arm host detection (#30490)
* [vcpkg_configure_make] Do not use dfferent names arm64

* Trigger Build

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
2023-04-19 14:35:20 -07:00
Billy O'Neal
fb0e86eb02
Revert "[scripts] Update Bazel to 6.1.2 (#30668)" (#30958)
This reverts commit 2514625831.
2023-04-18 18:45:23 -07:00
sbrajchuk
2514625831
[scripts] Update Bazel to 6.1.2 (#30668) 2023-04-18 18:44:25 -07:00
Kai Pastor
b08025687f
[vcpkg_find_acquire_program] Split out data (#30780) 2023-04-14 02:19:52 -07:00
Mengna Li
69efe9cc2d
update runtime version (#30546) 2023-03-31 21:00:54 -07:00
Kai Pastor
9b9c2758ec
[vcpkg_configure_meson] Update compiler flags parsing (#30271) 2023-03-20 11:45:02 -07:00
Kai Pastor
66372e84ae
Use msys2 bash regardless of target and of Windows Apps (#30172)
* Use msys2 bash regardless of target

* Insert msys root before Windows Apps

* Fix WindowsApps path
2023-03-20 00:04:15 -07:00
Kai Pastor
5da7b20588
[vcpkg_fixup_pkgconfig] Fix quoting (#29792)
* [unit-test-cmake] Check pkgconfig quoting

* [vcpkg_fixup_pkgconfig] Fix quoting
2023-03-14 17:07:19 -07:00
Kai Pastor
73b9a2a359
[openssl,vcpkg-cmake-get-vars] Fix android and emscripten, add feature tools (#29966)
* [vcpkg-cmake-get-vars] Call 'project' early

System variables like 'APPLE' or 'ANDROID' aren't set before 'project()'.

* Get Android variables

* [openssl] Ensure that compiler is reached via 'PATH'

* Fix Android configuration

* Add 'tools' feature

* Update versions

* [openssl] Initialize android with vcpkg settings

* [openssl] Really don't build apps

* [vcpkg-cmake-get-vars] Update android vars

* [libpq] Pass openssl version from pkgconfig

* [vcpkg-cmake-get-vars] Update android vars

* [vcpkg-cmake-get-vars] Report generator

* [vcpkg-cmake-get-vars] Escape all output

* Transfer cmake-get-vars fixes

* Transfer cmake-get-vars extra flags

* no-asm for android-arm w/o neon

* [vcpkg_configure_make] Unquote as needed

Toolchain flags are passed into make via environment variables (e.g.
CFLAGS) and expanded by Makefiles regardless of quotes. And even vcm's
internal handling isn't prepared for these quotes. So we must remove
the early. This doesn't interfere with properly escaped quotes.

* Re-add lost 'project', amends 4cf7caaa

* [openssl] Fix emscripten
2023-03-14 14:11:06 -07:00