Commit Graph

762 Commits

Author SHA1 Message Date
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
pastdue
5f14417300
vcpkg_configure_meson: Support wasm32-emscripten triplet (#26317)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-09-30 17:23:42 -07:00
Vladimir Serdyuk
b92daebd09
[scripts] fixes for armv7l host builds (#26510)
* [scripts] fixes for armv7l host builds

* [scripts] fix meson for 32-bit arm

* [scripts] replaced EXEC_PROGRAM with execute_process in ninja and pathelf paths in vcpkg_find_acquire_program
2022-09-30 17:22:06 -07:00
Alexander Neumann
ba1f91fd7e
[scripts|cmake] use ENV{VisualStudioVersion} to switch cmake generator (#26339)
* add VCPKG_CMAKE_VS_GENERATOR for overriding/providing a generator if ninja cannot be used

* Wording CR.

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>

* use VisualStudioVersion to switch the generator.

* v db

* CR changes

* v db

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2022-09-22 14:28:20 -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
f2453e0619
[Qt5|qmake] pass toolchain setup (#26354)
* [qt5/qmake] Pass toolchain flags to build

* v db

* forgot a dependency

* v db

* add required ar flags

* v db

* Apply suggestions from code review

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>

* v db

* inc port version

* v db

* qt5-base

* v db

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2022-09-12 13:30:47 -07:00
pastdue
0e9a28874c
Add VCPKG_TARGET_IS_EMSCRIPTEN, fix opus and libsodium ports for wasm32-emscripten (#26318)
* vcpkg_common_definitions: Add VCPKG_TARGET_IS_EMSCRIPTEN

* [opus] Fix wasm32-emscripten builds

* [libsodium] Fix wasm32-emscripten builds

* Run x-add-version
2022-09-08 14:01:20 -07:00
Russell Greene
5ace90c530
[scripts] Set VCPKG_TARGET_BUNDLE_SUFFIX to .app for iOS to allow for tools building more cleanly (#26612) 2022-09-01 09:25:11 -07:00
Alexander Neumann
f688b2e296
[vcpkg] add updated compile wrapper for clang-cl (#26340)
* add updated compile wrapper for clang-cl

* patch msys instead of adding the complete wrapper

* remove doubled line

* fix issue with direct packages
2022-08-29 17:30:53 -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
ef9628f449
[vcpkg script] build_nmake use z_vcpkg_get_cmake_vars (#25862)
* use z_vcpkg_get_cmake_vars instead of including the toolchain

* fix typo

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>

* add supports expressions

* use _ENV_ instead of ENV so vcpkgs flags will overwrite any other flags.
(also fixes pdcurses using LINK)

* v db

* version

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-08-19 15:12:14 -07:00
Cheney Wang
a68c22c9a7
[vcpkg] Fix typo (#26388) 2022-08-18 10:38:09 -07:00
Alexander Neumann
dc9d737351
[pixman] add missing include and fix clang-cl build (#26186)
* pixman: add missing include and fix clang-cl builds

* v db

* use correct <> isntead of ""

* v db

* make the patch depend on _MSC_VER

* v db

* fix bug in vcpkg_configure_meson not linking WindowsApp.lib
fix another bug that system=windowsstore which meson doesn recognize

* bump port version

* v db
2022-08-17 12:36:12 -07:00
autoantwort
9b618499f6
[vcpkg_from_gitlab] improvements (#23568)
* [vcpkg_download_distfile] Don't check downloaded file when ALWAYS_REDOWNLOAD is passed

* [vcpkg_from_github] fix error message and correctly set VCPKG_HEAD_VERSION

* [vcpkg_from_gitlab] Use gitlab api instead of git ls-remote

* no change

* Apply suggestions from code review

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

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-08-12 15:32:07 -07:00
Billy O'Neal
ae76307e4b
Audit use of TO_NATIVE_PATH. (#26201)
* Audit use of TO_NATIVE_PATH.

TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE.

Fixes https://github.com/microsoft/vcpkg/issues/26178

ports/ffmpeg/portfile.cmake:
Both uses are being embedded into a command line 

ports/gdal/dependency_win.cmake
117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate.
Drive by: Added quotes around other uses (all of which seem to be going to command lines).
202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now.

ports/msmpi/portfile.cmake
All 3 uses are being embedded into a command line 

ports/jemalloc/fix-utilities.patch
ports/libproxy/fix-dependency-libmodman.patch
ports/qtbase/env.patch
These are in upstream content / context so it is not edited.

ports/opengl/portfile.cmake
Broken! Drive by fixes:
* Modernized checking VCPKG_BUILD_TYPE
* Ordered things consistently to be release then debug.
* Removed funny newlines.

ports/openni2/portfile.cmake
Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes:
* Guarded debug-only copies for VCPKG_BUILD_TYPE
* Fixed supports expression

ports/openssl/unix/CMakeLists.txt:
Unused!

ports/pthreads/portfile.cmake:
Both uses are being embedded into a command line 

ports/qt5-base/cmake/qt_fix_makefile_install.cmake
I'm not sure if this one is OK but it's being embedded into a file so it's probably fine.

ports/qtapplicationmanager/portfile.cmake:
I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited.

ports/readosm/portfile.cmake:
The use is being embedded into a command line 

ports/spatialite-tools/portfile.cmake:
The use is being embedded into a command line 

ports/sqlcipher/portfile.cmake:
Both uses are being embedded into a command line 

scripts/ports.cmake:
Some uses were unused, others are immediately used and printed to the console. 

scripts/buildsystems/vcpkg.cmake:
Fixed :)

scripts/cmake/vcpkg_build_qmake:
Looks unused.

scripts/cmake/vcpkg_build_process.cmake:
Added to console message only. 

scripts/cmake/vcpkg_execute_required_process_repeat.cmake:
Added to console message only. 
Drive by: Fixed typo in variable name in the message.

scripts/cmake/vcpkg_execute_required_process.cmake:
Added to console message only. 

* Fix missing license.
2022-08-12 15:21:20 -07:00
Thomas1664
48369f2a2a
[vcpkg_download_distfile] Make file name more unique (#25607)
* [vcpkg_download_distfile] Add parameter `FILE_DISAMBIGUATOR`

* Add argument checks

* Make unparse args a fatal error

* Remove trailing ;

* Append instead of prepend hash

* Always append commit hash

* Only append file hash if hash differs from already installed file with same name
2022-08-01 15:14:44 -07:00
autoantwort
12a005017b
[dcmtk] no absolute paths (#25964) 2022-07-27 11:41:12 -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
49868fd552
[vcpkg-cmake] Update parallel vcpkg_cmake_configure (#21507)
* Revise generator selection

If the host is x86, assume that msbuild is requested for windows.
If msbuild is requested and suitable, use it.
Else if a particular generator is requested, use it.
Else if ninja is available, use it.
Else on non-windows host, use "Unix Makefiles".

* Revise ninja_host detection

* Revise parallel configure detection

* Consolidate ninja path setup

* Update documentation

* Use portable chdir

* [ms-gltf] Use new generator selection

* Update versions
2022-07-25 12:23:04 -07:00
Kai Pastor
687f4aab11
Save meson logs on failure (#25806)
* [vcpkg_configure_meson] Save log files on error

* Document SAVE_LOG_FILES option
2022-07-18 13:21:36 -07:00
Osyotr
42b2876645
[vcpkg] Fixup rpath after building dynamic libraries on linux (#23035)
* Fixup rpath after building dynamic libraries on linux

* Switch back to a single variable VCPKG_FIXUP_ELF_RPATH

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

* Don't force fixup in x64-linux triplet yet

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
2022-07-18 12:44:34 -07:00