diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-13 05:50:31 (GMT) |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-13 05:50:31 (GMT) |
commit | 57de8dcf22d5ddddee6a44f87f45f2c279fdb1ac (patch) | |
tree | 9477fd0a23bbe297fd11178b7ed6cd8c3c8a268a /patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch | |
parent | 4c9218d51dc3c6c84a8d5c488f234ed7575107c6 (diff) | |
parent | 5f3774cd656ba54200cb192fc1454c5232347b70 (diff) |
Merge pull request #239 from diorcety-ctng/cc-cygwin-mingw-linux
Canadian cross build = x86_64 Cygwin host = x86_64 MinGW_W64 target = x86_64 GNU/Linux
Diffstat (limited to 'patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch')
-rw-r--r-- | patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch b/patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch new file mode 100644 index 0000000..dacdfb1 --- /dev/null +++ b/patches/gettext/0.19.6/110-Fix-linker-error-redefinition-of-vasprintf.patch @@ -0,0 +1,31 @@ +From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Wed, 29 Feb 2012 10:44:43 +0100 +Subject: [PATCH] Fix linker error: redefinition of vasprintf + +This might not be the best patch, but it works for us +The link error was: +.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf' +.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here +--- + gettext-runtime/libasprintf/autosprintf.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc +index ca318f7..2526210 100644 +--- a/gettext-runtime/libasprintf/autosprintf.cc ++++ b/gettext-runtime/libasprintf/autosprintf.cc +@@ -19,8 +19,10 @@ + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ + #ifndef _GNU_SOURCE ++#ifndef _WIN32 + # define _GNU_SOURCE 1 + #endif ++#endif + + /* Specification. */ + #include "autosprintf.h" +-- +1.8.4 + |