| 1 |
commit: 615d11603e8cd6bf5f8b978505cfdc1aedfa0700 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 25 14:50:39 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 25 14:50:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=615d1160 |
| 7 |
|
| 8 |
dev-libs/libiconv-1.14-r1: fix for winnt |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-libs/libiconv/files/libiconv-1.14-winnt.patch | 31 +++++++++++++++++++++++ |
| 13 |
dev-libs/libiconv/libiconv-1.14-r1.ebuild | 1 + |
| 14 |
2 files changed, 32 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-libs/libiconv/files/libiconv-1.14-winnt.patch b/dev-libs/libiconv/files/libiconv-1.14-winnt.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000000..e49d1ce755 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/libiconv/files/libiconv-1.14-winnt.patch |
| 21 |
@@ -0,0 +1,31 @@ |
| 22 |
+--- libiconv-1.14/configure.orig 2017-09-21 10:12:09.263109700 +0200 |
| 23 |
++++ libiconv-1.14/configure 2017-09-21 10:12:26.809908100 +0200 |
| 24 |
+@@ -13478,7 +13478,7 @@ |
| 25 |
+ |
| 26 |
+ |
| 27 |
+ case "$host_os" in |
| 28 |
+- mingw* | cygwin*) is_woe32=yes ;; |
| 29 |
++ mingw* | cygwin* | winnt*) is_woe32=yes ;; |
| 30 |
+ *) is_woe32=no ;; |
| 31 |
+ esac |
| 32 |
+ WOE32=$is_woe32 |
| 33 |
+@@ -21687,7 +21687,7 @@ |
| 34 |
+ |
| 35 |
+ if test "$enable_shared" = yes; then |
| 36 |
+ case "$host_os" in |
| 37 |
+- mingw* | cygwin*) is_woe32dll=yes ;; |
| 38 |
++ mingw* | cygwin* | winnt*) is_woe32dll=yes ;; |
| 39 |
+ *) is_woe32dll=no ;; |
| 40 |
+ esac |
| 41 |
+ else |
| 42 |
+--- libiconv-1.14/woe32dll/export.h.orig 2017-09-21 10:02:45.106778900 +0200 |
| 43 |
++++ libiconv-1.14/woe32dll/export.h 2017-09-21 10:10:06.856742200 +0200 |
| 44 |
+@@ -104,3 +104,8 @@ |
| 45 |
+ /* Allocate a pseudo-variable IMP(x). */ \ |
| 46 |
+ extern int x; \ |
| 47 |
+ void * IMP(x) = &x; |
| 48 |
++ |
| 49 |
++#if defined(_MSC_VER) |
| 50 |
++# undef VARIABLE |
| 51 |
++# define VARIABLE(x) extern __declspec(dllexport) __declspec(dllimport) int x; |
| 52 |
++#endif |
| 53 |
|
| 54 |
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild |
| 55 |
index 932727ce37..04966b3632 100644 |
| 56 |
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild |
| 57 |
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild |
| 58 |
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
epatch "${FILESDIR}"/${P}-no-gets.patch |
| 62 |
+ epatch "${FILESDIR}"/${P}-winnt.patch |
| 63 |
elibtoolize |
| 64 |
} |
Archives