[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libiconv/files/, dev-libs/libiconv/

[Michael Haubenwallner]

commit:     615d11603e8cd6bf5f8b978505cfdc1aedfa0700
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 14:50:39 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 14:50:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=615d1160

dev-libs/libiconv-1.14-r1: fix for winnt

Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3

 dev-libs/libiconv/files/libiconv-1.14-winnt.patch | 31 +++++++++++++++++++++++
 dev-libs/libiconv/libiconv-1.14-r1.ebuild         |  1 +
 2 files changed, 32 insertions(+)

diff --git a/dev-libs/libiconv/files/libiconv-1.14-winnt.patch 
b/dev-libs/libiconv/files/libiconv-1.14-winnt.patch
new file mode 100644
index 0000000000..e49d1ce755
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.14-winnt.patch
@@ -0,0 +1,31 @@
+--- libiconv-1.14/configure.orig       2017-09-21 10:12:09.263109700 +0200
++++ libiconv-1.14/configure    2017-09-21 10:12:26.809908100 +0200
+@@ -13478,7 +13478,7 @@
+ 
+ 
+ case "$host_os" in
+-  mingw* | cygwin*) is_woe32=yes ;;
++  mingw* | cygwin* | winnt*) is_woe32=yes ;;
+   *) is_woe32=no ;;
+ esac
+ WOE32=$is_woe32
+@@ -21687,7 +21687,7 @@
+ 
+ if test "$enable_shared" = yes; then
+   case "$host_os" in
+-    mingw* | cygwin*) is_woe32dll=yes ;;
++    mingw* | cygwin* | winnt*) is_woe32dll=yes ;;
+     *) is_woe32dll=no ;;
+   esac
+ else
+--- libiconv-1.14/woe32dll/export.h.orig       2017-09-21 10:02:45.106778900 
+0200
++++ libiconv-1.14/woe32dll/export.h    2017-09-21 10:10:06.856742200 +0200
+@@ -104,3 +104,8 @@
+  /* Allocate a pseudo-variable IMP(x).  */                              \
+  extern int x;                                                          \
+  void * IMP(x) = &x;
++
++#if defined(_MSC_VER)
++# undef VARIABLE
++# define VARIABLE(x) extern __declspec(dllexport) __declspec(dllimport) int x;
++#endif

diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild 
b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index 932727ce37..04966b3632 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-no-gets.patch
+       epatch "${FILESDIR}"/${P}-winnt.patch
        elibtoolize
 }