Commit Graph

74 Commits

Author SHA1 Message Date
CQ_Undefine 5d2b8a6efd
scripts: Support autoconf cross compilation for *BSD and Solaris (#49438) 2026-01-28 01:17:21 -08:00
Thomas1664 cfcbdb245f
[vcpkg_configure_make] Prevent leakage of CC env variable from debug to release configuration (#48807) 2025-12-13 08:11:38 +00:00
Waldemar Kornewald af3bb76b7c
Added VCPKG_TARGET_IS_APPLE constant (#47816) 2025-10-20 05:17:45 -07:00
Waldemar Kornewald 53c13a7853
Add support for tvOS and watchOS platforms (#47024) 2025-10-13 12:00:59 -07:00
CQ_Undefine 4927a24f00
Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD (#47309) 2025-09-30 11:12:13 -07:00
Albert Lee 4334d8b4c8
[vcpkg] Add platform support for Solaris and illumos (#45524) 2025-09-18 00:20:36 +00:00
Colin Cornaby fb7ba3b89b
[vcpkg scripts] Adding support for visionOS (#45464) 2025-06-25 11:52:26 -07:00
Alexander Neumann 1b72637922
[scripts] Fix wasm builds (#39106) 2024-06-28 17:28:34 -07:00
Nathan Baird 027b48d217
Minor updates to comments for some verbiage that gets flagged by political correctness tools (#38719)
Replaces two terms used in comments with some more politically correct
alternatives.
2024-06-14 11:35:12 -07: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
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
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
Alexander Neumann e65af7bb5c
[vcpkg_configure_make] Fix serious case of WINDOWS yelling at you 2023-07-26 11:04:33 -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
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 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
jre-lsft cfdeb75bb6
Restore environment after `make` to avoid mixing-up linker flags (#29984)
Fixes #29983.
2023-03-13 15:02:32 -07:00
Kai Pastor 36fb23307e
[vcpkg_configure_make] Fix almost-native builds (#28760)
* [gmp] Set CCAS for native builds

* [vcpkg_configure_make] Move triplet detection

* [vcpkg_configure_make] Control cross tools by autotools triplet

* Update versions

---------

Co-authored-by: MonicaLiu <v-liumonica@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
2023-02-10 12:02:13 -08:00
Alexander Neumann 45e66bff9b
[scripts|vcpkg_configure_make] Help C(XX)FLAGS survive through libtool (#28349)
* help cflags survive through libtool

* Guard -Xcompiler in case of gcc/gnu

since it doesn't like unknown compiler flags.

* export CMAKE_<lang>_COMPILER_FRONTEND_VARIANT from cmake

* v db and script changes

* also check compiler id

Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-07 01:04:32 -08:00
Osyotr 8b9ebdccdf
[vcpkg_configure_make] Respect host triplet when determining --build (#28331)
Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-07 01:01:31 -08:00
Alexander Neumann d8e60ef474
[vcpkg scripts] Crosscompiling fixes (#26617)
* test osx stuff

* deactivate most of ci

* get trace output

* add required flags to the linker flags

* also look for --sysroot

* Link_args are always shared

* fix ar flags

* setup FOR_BUILD vars.

* try tricking the build.... but man configure scripts are stupid sometimes...

* try 2

* major meson rewrite

* fix duplicates

* revert --trace-expand

* update port version

* revert pipeline changes

* v db

* bump version

* v db

* set flags for rc compilers

* a few more ios fixes.

* v db

* fix osx/ios logic

* documentation and don't fatal_error in build/host machine entry calculation.

* add android/compiler target stuff from #26570

* remove extra endif

* v db

* add target param to linker flags.

* target in cpp flags

* Make vcpkg-cmake-get-vars more ios compatible

* Update scripts/get_cmake_vars/CMakeLists.txt

Co-authored-by: Matthias Kuhn <matthias@opengis.ch>

* More ios fixes

* fix target adding

* Fix broken loop

* v db

* v db

* bump date

* v db

* v db

* v db

* remove port-version 1

* v db

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
2022-10-13 09:40:52 -07:00
Dawid Wróbel 4340582bc3
[vcpkg_acquire_msys] add 'which' package to default set on Windows (#26618)
* [vcpkg_acquire_msys] add 'which' package

* [vcpkg_configure_make] add 'which' to default msys packages on Windows

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-09-19 14:00:14 -07:00
Alexander Neumann 624f1b4eca
[jemalloc|vcpkg_configure_make] update and some script fixes (#25009)
* WIP commit

* more jemalloc wip

* v db

* add license

* v db

* apply format diff

* fix script

* WIP commit

* fix ARFLAGS for the wrapper

* CR stuff

* v db

* use separate_arguments to add -Wl, to linker flags

* say "-Xlinker" three times and it will come.

* make assembler compile only.

* disable _FOR_BUILD if crosscompiling.
use function instead of macro.

Remove AS settings

* ignore settings for osx until somebody knows how to fix it.

* CR z_vcpkg_make_set_env

* CI retrigger

* make conflicting options an error

* remove DEFINED since the options are always defined
2022-08-19 15:13:23 -07:00
Alexander Neumann d052cd6113
[vcpkg script] Normalize PATH so that insertion of msys paths always works (#25848)
* Normalize PATH so that insertion of msys paths always works

This is required if the PATH variable has been modified and doesn't follow the normal windows style

* make it better

* switch path manipulations. vcpkg wrapper dir needs to come first.
2022-07-25 13:26:12 -07:00
Kai Pastor 39b548c8e5
[scripts|world rebuild] Always save `config.log` and `CMakeCache.txt` (#25189)
* Always save config.log, even on error

* Always save config.log and CMakeCache.txt[.log]

* Add SAVE_LOG_FILES option

* Make implicit lookups explicit

* Update versions
2022-07-07 14:58:03 -07:00
Robert Schumacher 7d2449c346
[docs] Delete embedded documentation in favor of docs/ (#25096)
* [docs] Delete embedded documentation in favor of docs/

Drive-by for the helper ports:
1. "documentation": "https://vcpkg.io/en/docs/README.html"
2. "license": "MIT"
3. Use `include_guard(GLOBAL)` in all script files
4. Make sure any persistent variables are saved to the cache

* [docs] Restore empty regenerate.ps1 to satisfy Azure Pipelines

* [docs] PR comments
2022-06-07 16:26:51 -07:00
Kai Pastor f20c7bf05b
[vcpkg-configure-make] Fix include path prepending (#24823)
* Fix include path prepending

* Update DISABLE_VERBOSE_FLAGS documentation

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-05-20 14:41:10 -07:00
Jack·Boos·Yu 0d7603c4ef
[vcpkg_setup_pkgconfig_path] Add new functions to set or restore pkgconfig related environment variables (#23429)
* [vcpkg_configure_meson] Fix append host path

* New functions vcpkg_setup_pkgconfig_path and vcpkg_restore_pkgconfig_path

* Fix bug, add cos

* Apply suggestions

* Apply suggestions

* Apply suggestion

* doc

* Update docs/maintainers/vcpkg_setup_pkgconfig_path.cmake.md

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_setup_pkgconfig_path.cmake

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_configure_make.cmake

* Apply suggestions

* Apply suggestion

* Apply suggestions

Co-authored-by: Victor Romero <viromer@microsoft.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
2022-05-09 17:23:32 -07:00
Alexander Neumann 05c93c5c5a
[Fix uwp toolchain|world rebuild] make ninja work for uwp (#22831) 2022-04-27 18:12:48 -07:00
Jack·Boos·Yu e86ed50718
[vcpkg_configure_make] Report warning when unresolved arguments are passed in (#22567)
* [vcpkg_configure_make] Report warning when unresolved arguments are passed in

* Add missing option NO_DEBUG

* Add _VCPKG_MAKE_NO_DEBUG for vcpkg_configure_make

* Add more condition

* [apr] Remove NO_DEBUG

* [liburing] Remove NO_DEBUG

* [apr-util] Remove NO_DEBUG

* version

* Mssing port-version ++

* version
2022-03-02 13:43:19 -08:00
Daniel Schürmann 016788b220
[vcpkg_configure_make] Fix handling of link flags (#22798)
* [vcpkg_build_make] only link against manual-link folder if exists

* [vcpkg_configure_make] don't set LD_LIBRARY_PATH

This is not recommended during the normal build process
https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html

* [vcpkg_build_make] Only set the lib path if exists

* [vcpkg_configure_make] Resore handling of _LINK_ environment variable

* [vcpkg_build_make] Backup and restore CPPFLAGS CFLAGS CXXFLAGS RCFLAGS

* [vcpkg_build_make] Fix name of LINKER FLAGS detected from cmake

* [vcpkg_build_make] replace obolete _VAR_SUFFIX with cmake_buildtype
2022-02-15 18:31:16 -08:00
Daniel Schürmann d15470bb64
[vcpkg_configure_make] Set the --host parameter in case of Linux crosscompile (#22331)
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2022-02-08 22:53:17 -08:00
Kai Pastor fdb593292c
[vcpkg] Always use an autotools build triplet (#18130)
* Always use a build triplet for mingw

* [vcpkg_configure_make] Always assume cross-compilation

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-03 21:29:29 -07:00
Jack·Boos·Yu 5283cdb370
[scripts-audit] Make buildsystem (#20165)
* [script-audit] Make buildsystem

* Fix wrongly merge

* Fix rename

* Format

* Apply suggestions

* Apply suggestion

* Fix bug

* Change the function names

* Fix command line

* Apply suggestions

* version

* typo

* Apply suggestions

* Fix bug

* Fix path

* Fix bug

* Fix un=parser code, move macros to the top

* Apply suggestions

* Update docs

* update doc

* CRLF

* add docs and add a PARENT_SCOPE

* Update doc

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-10-20 14:12:58 -07:00
Jack·Boos·Yu 143cfa363c
[vcpkg_configure_make] Fix environment variable _LINK_ (#20652) 2021-10-11 20:41:51 -07:00
Kai Pastor 2ed5383f7b
[vcpkg_configure_make] Standardize `OPTIONS` list item handling (#19540)
* Remove unused EXTRA_QUOTES

* Uniformly invoke 'configure'

* [libtasn1] Fix mingw build

* Unify prefix handling

* Revise install dir processing

* x-add-version

* Force libdir to lib (adopted from #19666)

* [skip actions] CI rebuild

* CR request: Put backslash before shell var

* CR request: Use vcpkg_list

* Update versions

* Fix python3 options

* Update versions

* Bump python port-version.

* CR request: Add comment about backslashes before prefix

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-30 23:58:36 -07:00
Nicolas Fella 59a3f35e7e
[vcpkg_configure_make] Force libdir to lib (#19666)
Some Linux distributions (e.g. the OpenSUSE family) defaults to lib64
instead of lib, which breaks vcpkg's assumtion that libraries are in
lib.

Use the --libdir option of autotools to force the directory to be lib
2021-09-24 12:41:20 -07:00
Kai Pastor 57bd7102d9
[vcpkg baseline][vcpkg_configure_make] Pass make tool to `vcpkg_build_make` (#19361)
* Pass 'make' between vcpkg scripts

* Restore original BSD gmake lookup

* [starlink-ast] Add ADDITIONAL_MSYS_PACKAGES to vcpkg_configure_make

* [starlink-ast] x-add-version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-08-07 07:48:44 -07:00
nicole mazzuca 5304f826b5
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-29 09:47:35 -07:00
huangqinjin 56a33d86b3
[vcpkg/scripts/make] avoid versioning for android (#17089) 2021-07-26 10:53:47 -07:00
Eric Kilmer 84b96cf7b3
vcpkg_configure_make: MacOS assume target arch is host arch (#18632)
This is to guard against MacOS triplets that don't list
VCPKG_OSX_ARCHITECTURES
2021-07-22 21:56:14 -07:00
Kai Pastor 098fd5af18
[vcpkg_configure_make] Fix mingw (cross) build issues (#18554)
* Set ENV{WINDRES} for mingw

* Fix passing of '${prefix}' for mingw cross builds
2021-06-30 13:12:06 -07:00
pastdue 38d2893b30
Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) (#18132)
* Add VCPKG_MAKE_CONFIGURE_OPTIONS that can be set in the triplet

To append options to the configure command

* Add documentation

* Expand without quotes

Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>

* Add VCPKG_CMAKE_CONFIGURE_OPTIONS that can be set in the triplet

Co-Authored-By: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump vcpkg-cmake port-version

* Run x-add-version vcpkg-cmake

* Apply suggestions from code review

* [vcpkg-cmake] add version

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-08 09:50:09 -07:00
huangqinjin 04b6a4b927
[vcpkg/scripts/make] correct linker flag name (#17084)
* [vcpkg/scripts/make] correct linker flag name

* Trigger CI
2021-06-03 14:56:25 -07:00
Kai Pastor 4386dda0e0
[vcpkg] Don't override pkg-config prefix (#17205)
* Don't override pkg-config prefix

* Rebuild
2021-06-03 14:55:50 -07:00
huangqinjin fbbadfc1ce
[vcpkg/scripts/make] determine whether to use automake wrappers (#17215) 2021-05-26 13:48:41 -07:00
Kai Pastor df34b02e52
[vcpkg] Fix lib uuid handling for x64-mingw-dynamic (#17137)
* Link static uuid on MiNGW

* Trigger rebuild
2021-05-26 09:13:16 -07:00
Kai Pastor 44da6b78fc
[vcpkg_configure_make] Don't create empty elements in include path vars (#17970) 2021-05-24 15:47:44 -07:00
autoantwort af5b5d3659
vcpkg_configure_make: Add support for linux -> windows cross compilation (#17073)
* vcpkg_configure_make: Add support for linux -> windows cross compilation

* vcpkg_configure_make: Merge some logic

* vcpkg_configure_make: add TODO comment

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build
2021-04-30 11:26:05 -07:00