diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-04-27 14:24:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 14:24:53 -0700 |
| commit | 68726d313f59d2343edf8809b32533567428e3a0 (patch) | |
| tree | 6c6126a7614ebda8c6fc001c84ca91c2f955e609 | |
| parent | 2e6d5c3611781c28b0efa62a6ea5bce17cf06d10 (diff) | |
| parent | 85f694b366cf21d9fa99599dc9cba88dba01c86b (diff) | |
| download | vcpkg-68726d313f59d2343edf8809b32533567428e3a0.tar.gz vcpkg-68726d313f59d2343edf8809b32533567428e3a0.zip | |
Merge pull request #990 from codicodi/fix-icu
[icu] fix build with 64bit msys
| -rw-r--r-- | ports/icu/CONTROL | 2 | ||||
| -rw-r--r-- | ports/icu/portfile.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 5e63a841b..3553238f9 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,3 @@ Source: icu
-Version: 59.1
+Version: 59.1-1
Description: Mature and widely used Unicode and localization library.
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 249a6dbc5..11637b061 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -24,10 +24,13 @@ set(ENV{PATH} "${NEWPATH}") set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
vcpkg_execute_required_process(
- COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make"
+ COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make automake1.15"
WORKING_DIRECTORY "${MSYS_ROOT}"
LOGNAME "pacman-${TARGET_TRIPLET}")
+set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
+file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
+
set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --disable-samples --disable-tests")
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|