aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHleb Valoshka <375gnu@gmail.com>2020-03-11 19:07:39 +0300
committerGitHub <noreply@github.com>2020-03-11 09:07:39 -0700
commitc84dfe7ddd6f3ba14ec9f4b1f2c577365175128b (patch)
tree3164735d477c9cc7535913260275670610a1d950
parent93045f29748a614ae02b89d06beb9b5a5fd25fc9 (diff)
downloadvcpkg-c84dfe7ddd6f3ba14ec9f4b1f2c577365175128b.tar.gz
vcpkg-c84dfe7ddd6f3ba14ec9f4b1f2c577365175128b.zip
[gettext] fix build with mingw-w64 (#10077)
-rw-r--r--ports/gettext/0003-Fix-win-unicode-paths.patch2
-rw-r--r--ports/gettext/CONTROL2
-rw-r--r--ports/gettext/config.win32.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/ports/gettext/0003-Fix-win-unicode-paths.patch b/ports/gettext/0003-Fix-win-unicode-paths.patch
index f86c52c86..540ac3d92 100644
--- a/ports/gettext/0003-Fix-win-unicode-paths.patch
+++ b/ports/gettext/0003-Fix-win-unicode-paths.patch
@@ -16,7 +16,7 @@ index 63351523..c078de3f 100644
+# endif
+# undef NOMINMAX
+# define NOMINMAX
-+# include <Windows.h> // For: MultiByteToWideChar
++# include <windows.h> // For: MultiByteToWideChar
+# include <io.h>
+# include <wchar.h>
+
diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL
index 5cfa7b0d7..0918e1943 100644
--- a/ports/gettext/CONTROL
+++ b/ports/gettext/CONTROL
@@ -1,5 +1,5 @@
Source: gettext
-Version: 0.19-14
+Version: 0.19-15
Homepage: https://www.gnu.org/software/gettext/
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.
Build-Depends: libiconv
diff --git a/ports/gettext/config.win32.h b/ports/gettext/config.win32.h
index b68467cf3..e8507894d 100644
--- a/ports/gettext/config.win32.h
+++ b/ports/gettext/config.win32.h
@@ -275,7 +275,9 @@
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mempcpy' function. */
-/* #undef HAVE_MEMPCPY */
+#ifdef __GNUC__
+#define HAVE_MEMPCPY 1
+#endif
/* Define to 1 if you have a working `mmap' system call. */
/* #undef HAVE_MMAP */