diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-08-04 13:27:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 13:27:40 -0700 |
| commit | ff190a561ad8903086ac72f65b05798058045435 (patch) | |
| tree | 2de7d0252e06dcd6db80aac20d0d73a763f64052 /ports/libunistring | |
| parent | bd5ea16b97e91cb620fed0e10b7d9b3a8a943a52 (diff) | |
| download | vcpkg-ff190a561ad8903086ac72f65b05798058045435.tar.gz vcpkg-ff190a561ad8903086ac72f65b05798058045435.zip | |
[macos ci] update 2021-07-27 (#19207)
* update 2021-07-27
macOS -> 11.5.1, XCode -> 12.5.1
* update azure-pipelines
* update sha of macfuse
* change how macos-ci-base works
* fix build errors
* fix itpp:linux
* more fixes
* remove tab
* allow version changes in all the remove/rename-version patches
* fix libunistring for real
* robert CR
Diffstat (limited to 'ports/libunistring')
| -rw-r--r-- | ports/libunistring/fix-for-automake-1.16.4.patch | 13 | ||||
| -rw-r--r-- | ports/libunistring/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/libunistring/vcpkg.json | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ports/libunistring/fix-for-automake-1.16.4.patch b/ports/libunistring/fix-for-automake-1.16.4.patch new file mode 100644 index 000000000..2e9a2ebda --- /dev/null +++ b/ports/libunistring/fix-for-automake-1.16.4.patch @@ -0,0 +1,13 @@ +--- a/m4/init-package-version.m4 ++++ b/m4/init-package-version.m4 +@@ -82,9 +82,9 @@ + [AC_SUBST([PACKAGE], [$1]) + AC_SUBST([VERSION], [$2]) + ]) + m4_define([AM_INIT_AUTOMAKE], + m4_defn([gl_RPL_INIT_AUTOMAKE])) + ]) +-m4_define([gl_INIT_DUMMY], []) ++m4_define([gl_INIT_DUMMY], [dummy]) + AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ + m4_ifval([$2], diff --git a/ports/libunistring/portfile.cmake b/ports/libunistring/portfile.cmake index a443ec9cc..e9eef0641 100644 --- a/ports/libunistring/portfile.cmake +++ b/ports/libunistring/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIBUNISTRING_VERSION} + PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef ) vcpkg_configure_make( diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json index b11bbb6fa..585ddca79 100644 --- a/ports/libunistring/vcpkg.json +++ b/ports/libunistring/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libunistring", "version": "0.9.10", + "port-version": 1, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", "supports": "!windows", |