Commit Graph

782 Commits

Author SHA1 Message Date
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
jre-lsft
cfdeb75bb6
Restore environment after make to avoid mixing-up linker flags (#29984)
Fixes #29983.
2023-03-13 15:02:32 -07:00
Todor Prokopov
82e03905f5
[qt5] MinGW build fixes (#29505)
* [qt5] MinGW build fixes

* [qt5] Remove e-mail headers from mingw9.patch

* [qt5] Run vcpkg x-add-version

* Cleanup qt5-base icu libs setup

Windows-shared needs different options. Patch obsolete.

* Check early for mingw32-make

* Revise make install path fixup

---------

Co-authored-by: Kai Pastor <dg0yt@darc.de>
2023-02-22 13:17:37 -08: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
reito
9d07914638
[vcpkg] fix proxy hint that should be fixed long time ago (#29346)
* fix proxy hint that should be fixed long time ago

* rebase master
2023-02-08 13:51:10 -08:00
reito
75381ea7fa
[gn-related-ports] Fix gn based projects build error on Windows (#29058)
* fix gn path error on windows

* add quotes

* vcpkg cmake guidelines

* Fix version database.

* Use Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL instead of WARNING

* Quotes 🤦

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-26 18:53:54 -08:00
Aleksi Sapon
50805d6ece
Add support for different LFS url to vcpkg_from_git (#28693) 2023-01-23 16:26:29 -08:00
Matthew Oliver
19b64e8b9e
[nasm] Update to 2.16.01. (#28950)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-19 18:43:57 -08:00
Robert Coup
38364cede1
always strip whitespace when calling uname -m (#28939) 2023-01-19 18:39:39 -08:00
Kai Pastor
edcf949452
[vcpkg_fixup_pkgconfig] Check for more problems, add unit test (#23898)
* Print stack traces for failed unit tests

* Add test for vcpkg_fixup_pkgconfig.cmake

* Check for 'optimized' and 'debug' in pc files

* Check for 'NOTFOUND' and for 'ns::target' in pc files

* Check for, and fix, line continuations

* Test file path substitutions

* Move contents processing into separate function

* Update and leverage line break normalization

* Pass prefix to data processing

* Validate only the collapsed Libs

* Test removal of '<field>.private'

* Declare unit test license (same as vcpkg)

* Replace ';' with ' ' in 'Libs:'

* Disambiguate parameter variable names

* Test quoting of variables

* Fix quoting of variables

* Quote whole parameters

* Process and quote libs item-wise

* Resolve keywords 'optimized', 'debug', 'debug'

* Consistency

* CI [skip actions]

* CI [skip actions]

* Don't fail on detected errors

* Disable unit-testing for fatal errors

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2023-01-19 18:27:29 -08:00
Robert Schumacher
24c85bacab
[vcpkg_configure_cmake] Partially revert #26959 (#28483)
We must avoid significant breaking changes to the sets of scripts coupled to the vcpkg tool version.
2023-01-18 11:44:24 -08:00
JonLiu1993
fd766eba2b
[vcpkg] update msys-libtool version (#28919)
* [vcpkg] update msys-libiconv versio

* [vcpkg] update msys-libtool version
2023-01-16 12:30:37 -08:00
reito
5b76887a11
update gas-preprocessor and clang in vcpkg_find_acquire_program (#28467)
Co-authored-by: Cheney-Wang <850426846@qq.com>
Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2023-01-11 23:24:44 -08:00
autoantwort
0960ce8c46
vcpkg_execute_build_process.cmake: Check if the exit code is a string (#28405)
Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-11 16:13:00 -08:00
Kai Pastor
55c29f1dca
[scripts|world rebuild] Disambiguate saved log files (#26754)
* Disambiguate saved log files

* CI [skip actions]

* CI [skip actions]

* CI [skip actions]

* Use ALIAS keyword instead of auto-numbering

* Update versions
2023-01-09 11:13:59 -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
Lily Wang
9033fcdf28
[vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell (#28352)
* [vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell

* x-add-version

* update vcpkg_install_msbuild.cmake

* x-add-version

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

Co-authored-by: Jonliu1993 <13720414433@163.com>
2023-01-04 12:11:05 -08:00
Kai Pastor
56765209ec
[vcpkg_clean_executables_in_bin] Clean bundles (#28335) 2022-12-14 18:23:44 -08:00
Kai Pastor
f11bad8304
[vcpkg_configure_gn] Remove build dir before configure (#28006) 2022-11-28 09:58:38 -08:00
Adam Johnson
5599ae4ccf
[python3] Bump to 3.10.7 (#27558)
* [python3] Make patch files contiguous.

When applying these back to the python3 repository and re-formatting,
the gap in patch file numbers requires annoying manual renaming. Debunk
that.

* [python3] Use patch files, not diffs.

Diffs require multiple steps to import into the python3 repository.
Debunk that. The patch format retains authorship information.

* [python3] Fix problems with conflicting patches.

Something modified in the static library patch was being used as a
context line in a later patch. How did this pass CI?

* [python3] Bump to 3.10.7.

* [python3] Fix Windows 7 patch.

* [python3] Back out trivial patch changes.

* [python3] Apply unconditional patches first.

* version things and stuff

* Bump Python tools to 3.10.7.
2022-11-18 11:53:08 -08:00
Kai Pastor
895072c824
[vcpkg_build_make] Correctly use arg_OPTIONS, not arg_MAKE_OPTIONS (#27675)
* Correctly use arg_OPTIONS, not arg_MAKE_OPTIONS

* CI
2022-11-11 10:33:51 -08:00
Aleksi Sapon
57ae838ee8
Add optional LFS support to vcpkg_from_git (#27461) 2022-11-07 07:55:41 -08:00
Thomas1664
c5fb4ecf7f
[vcpkg-tool][world rebuild] Enable FETCHCONTENT_FULLY_DISCONNECTED (#26959)
* Enable FETCHCONTENT_FULLY_DISCONNECTED

* Bump version

* version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-03 14:59:31 -07:00
Kai Pastor
3e35cb0a15
[scripts|nmake] Add jom option, add language control (#27255)
* Add CL_LANGUAGE option

* Add PREFER_JOM option

* Append install target to targets, not options

* Update vcpkg_install_nmake

* Re-enable nmake UWP builds for C projects

* Use PREFER_JOM

* Update documentation

* Update versions

* Add license fields

* Update versions
2022-11-02 11:32:43 -07:00
Kai Pastor
a1af533095
[scripts] Fix meson for mingw (#27380)
* Fix mingw

* Remove invalid transformation

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-10-25 20:50:13 -07:00
Alexander Neumann
4aac676746
[qt5] Fix pkg-config setup in qt5-base (#27404)
* [qt5] fix pkg-config search path and save qmake config.log

* v db
2022-10-24 16:23:22 -07: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
day253
11967e7797
[vcpkg] GENERATOR with Makefiles can build parallel (#26780)
* GENERATOR with Makefiles can build parallel

* resolved conflicts

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-10-08 21:48:41 -07:00
Kai Pastor
27b04e77aa
[scripts|world rebuild] Retry 'make install' in non-parallel mode (#27105)
* Retry 'make install' in non-parallel mode

* CI [skip actions]
2022-10-08 21:36:46 -07:00