diff options
| author | Matthias Kuhn <matthias@opengis.ch> | 2021-06-10 00:49:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 15:49:39 -0700 |
| commit | f7612e6e14b5bbdf680f97ea12f4ceb2368a2ebb (patch) | |
| tree | f3ae85074340de95c47e22dcf38a7c184679742e | |
| parent | f6eb4c50ba6502c35b3ef70273c01ca7ddd955eb (diff) | |
| download | vcpkg-f7612e6e14b5bbdf680f97ea12f4ceb2368a2ebb.tar.gz vcpkg-f7612e6e14b5bbdf680f97ea12f4ceb2368a2ebb.zip | |
[gettext] Fix building for android (#18128)
* Fix building gettext for android
Taken from https://github.com/navit-gps/navit/pull/1087/files
* Bump gettext port version
| -rw-r--r-- | ports/gettext/android.patch | 12 | ||||
| -rw-r--r-- | ports/gettext/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/gettext/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/gettext.json | 5 |
5 files changed, 20 insertions, 2 deletions
diff --git a/ports/gettext/android.patch b/ports/gettext/android.patch new file mode 100644 index 000000000..6f2a7d43f --- /dev/null +++ b/ports/gettext/android.patch @@ -0,0 +1,12 @@ +diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c +--- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 ++++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 +@@ -143,7 +143,7 @@ + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else ++# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) + char *getcwd (); + # endif + # endif diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 1d2810399..a595a6d27 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_extract_source_archive_ex( 0002-Fix-uwp-build.patch 0003-Fix-win-unicode-paths.patch rel_path.patch + android.patch ${PATCHES} ) vcpkg_find_acquire_program(BISON) diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index b4b05141a..57cb5439a 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 2, + "port-version": 3, "description": "The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a18c2b32f..5945d02db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2242,7 +2242,7 @@ }, "gettext": { "baseline": "0.21", - "port-version": 2 + "port-version": 3 }, "gettimeofday": { "baseline": "2017-10-14-3", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index faca73bb7..06a70ef68 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "33c7af8451faeef94c8a06cb41b71dce144d6fba", + "version": "0.21", + "port-version": 3 + }, + { "git-tree": "7aba831bc44964ac3d3767392b037e30b06d897e", "version": "0.21", "port-version": 2 |