From f7612e6e14b5bbdf680f97ea12f4ceb2368a2ebb Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 10 Jun 2021 00:49:39 +0200
Subject: [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
---
 ports/gettext/android.patch  | 12 ++++++++++++
 ports/gettext/portfile.cmake |  1 +
 ports/gettext/vcpkg.json     |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 ports/gettext/android.patch

(limited to 'ports')

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": [
-- 
cgit v1.2.3