mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 14:22:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[icu] Update automake dependency 1.15 -> 1.16 (#13980)

Browse Source 
* [icu] Update automake dependency 1.15 -> 1.16 

automake 1.15 is not available through msys anymore; automake 1.16 is the oldest available version.

* [icu] Update CONTROL version

Co-authored-by: LilyWangL <wangli28@beyondsoft.com>
This commit is contained in:
hannesweisbach 2020-10-13 22:28:09 +02:00 committed by GitHub
parent 654adc64b3
commit 15ec0792d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/icu/CONTROL
View File

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

6
ports/icu/portfile.cmake
View File

@ -77,7 +77,7 @@ else()
set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32")
# Acquire tools
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)
# Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
@ -85,7 +85,7 @@ else()
set(ENV{PATH} "${NEWPATH}")
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.16)
file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
if(VCPKG_CRT_LINKAGE STREQUAL static)
@ -236,4 +236,4 @@ vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)