diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-13 15:54:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 15:54:38 -0700 |
| commit | 1c5798197673092ccd95556c2b72f51c7572954e (patch) | |
| tree | 2d73bac49409ee6a56691d7b5dd15b0c365bc04e /ports/libiconv/0001-Add-export-definitions.patch | |
| parent | bd6a1e59dd633a932105bb801e7b399a5dc026ab (diff) | |
| parent | eb2a2e375daaf4518d34452460bb4a0983818cec (diff) | |
| download | vcpkg-1c5798197673092ccd95556c2b72f51c7572954e.tar.gz vcpkg-1c5798197673092ccd95556c2b72f51c7572954e.zip | |
Merge pull request #152 from muemart/iconv
Improve iconv port
Diffstat (limited to 'ports/libiconv/0001-Add-export-definitions.patch')
| -rw-r--r-- | ports/libiconv/0001-Add-export-definitions.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ports/libiconv/0001-Add-export-definitions.patch b/ports/libiconv/0001-Add-export-definitions.patch new file mode 100644 index 000000000..c59d15d9e --- /dev/null +++ b/ports/libiconv/0001-Add-export-definitions.patch @@ -0,0 +1,34 @@ +diff --git "a/include/iconv.h.build.in" "b/include/iconv.h.build.in" +index 0feb068..74e5613 100644 +--- "a/include/iconv.h.build.in" ++++ "b/include/iconv.h.build.in" +@@ -27,6 +27,12 @@ + #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default"))) ++#elif defined(_WIN32) && @LIBICONV_DYNAMIC@ ++ #if defined(libiconv_EXPORTS) ++ #define LIBICONV_DLL_EXPORTED __declspec(dllexport) ++ #else ++ #define LIBICONV_DLL_EXPORTED __declspec(dllimport) ++ #endif + #else + #define LIBICONV_DLL_EXPORTED + #endif + extern LIBICONV_DLL_EXPORTED @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ + +diff --git "a/libcharset/include/localcharset.h.build.in" "b/libcharset/include/localcharset.h.build.in" +index c691359..2a23585 100644 +--- "a/libcharset/include/localcharset.h.build.in" ++++ "b/libcharset/include/localcharset.h.build.in" +@@ -24,6 +24,12 @@ + #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default"))) ++#elif defined(_WIN32) && @LIBICONV_DYNAMIC@ ++ #if defined(libcharset_EXPORTS) ++ #define LIBCHARSET_DLL_EXPORTED __declspec(dllexport) ++ #else ++ #define LIBCHARSET_DLL_EXPORTED __declspec(dllimport) ++ #endif + #else + #define LIBCHARSET_DLL_EXPORTED + #endif + + |