3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

Fix bootstrapping MSYS2 pacman (#11499) (#12080)

Browse Source
This commit is contained in:
Vicki Pfau 2020-06-24 11:29:28 -07:00 committed by GitHub
parent 7042764fe1
commit eede79eb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/CONTROL
View File

@ -1,5 +1,5 @@
Source: ffmpeg Source: ffmpeg
Version: 4.2-11 Version: 4.2-12
Build-Depends: zlib Build-Depends: zlib
Homepage: https://ffmpeg.org Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.

2
ports/ffnvcodec/CONTROL
View File

@ -1,4 +1,4 @@
Source: ffnvcodec Source: ffnvcodec
Version: 9.1.23.1 Version: 9.1.23.1-1
Homepage: https://github.com/FFmpeg/nv-codec-headers Homepage: https://github.com/FFmpeg/nv-codec-headers
Description: FFmpeg version of Nvidia Codec SDK headers. Description: FFmpeg version of Nvidia Codec SDK headers.

2
ports/icu/CONTROL
View File

@ -1,5 +1,5 @@
Source: icu Source: icu
Version: 67.1-1 Version: 67.1-2
Homepage: http://icu-project.org/apiref/icu4c/ Homepage: http://icu-project.org/apiref/icu4c/
Description: Mature and widely used Unicode and localization library. Description: Mature and widely used Unicode and localization library.
Supports: !(arm|uwp) Supports: !(arm|uwp)

2
ports/libpq/CONTROL
View File

@ -1,5 +1,5 @@
Source: libpq Source: libpq
Version: 12.2-2 Version: 12.2-3
Build-Depends: libpq[bonjour] (osx) Build-Depends: libpq[bonjour] (osx)
Supports: !uwp Supports: !uwp
Homepage: https://www.postgresql.org/ Homepage: https://www.postgresql.org/

2
ports/libvpx/CONTROL
View File

@ -1,5 +1,5 @@
Source: libvpx Source: libvpx
Version: 1.8.1-6 Version: 1.8.1-7
Homepage: https://github.com/webmproject/libvpx Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9. Description: The reference software implementation for the video coding formats VP8 and VP9.
Supports: !(uwp&arm) Supports: !(uwp&arm)

2
ports/tensorflow-cc/CONTROL
View File

@ -1,5 +1,5 @@
Source: tensorflow-cc Source: tensorflow-cc
Version: 1.14-2 Version: 1.14-3
Description: Library for computation using data flow graphs for scalable machine learning Description: Library for computation using data flow graphs for scalable machine learning
Build-Depends: c-ares Build-Depends: c-ares
Supports: !x86 Supports: !x86

12
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -98,6 +98,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;gpgconf --homedir /etc/pacman.d/gnupg --kill all" COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;gpgconf --homedir /etc/pacman.d/gnupg --kill all"
WORKING_DIRECTORY ${TOOLPATH} WORKING_DIRECTORY ${TOOLPATH}
) )
# we need to update pacman before anything else due to pacman transitioning
# to using zstd packages, and our pacman is too old to support those
_execute_process(
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Sy pacman --noconfirm"
WORKING_DIRECTORY ${TOOLPATH}
)
# dash relies on specific versions of the base packages, which prevents us
# from doing a proper update. However, we don't need it so we remove it
_execute_process(
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Rc dash --noconfirm"
WORKING_DIRECTORY ${TOOLPATH}
)
_execute_process( _execute_process(
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm" COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm"
WORKING_DIRECTORY ${TOOLPATH} WORKING_DIRECTORY ${TOOLPATH}