1 |
commit: 1954f9694b2c77917e70b4b901708bf8d4eda451 |
2 |
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com> |
3 |
AuthorDate: Wed May 25 08:31:30 2016 +0000 |
4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 08:39:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1954f969 |
7 |
|
8 |
sys-devel/gettext: fix cygwin patch |
9 |
|
10 |
sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch | 64 ++++++++-------------- |
11 |
1 file changed, 23 insertions(+), 41 deletions(-) |
12 |
|
13 |
diff --git a/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch b/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch |
14 |
index f28a7a9..3f2e4c4 100644 |
15 |
--- a/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch |
16 |
+++ b/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch |
17 |
@@ -31,9 +31,9 @@ Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll |
18 |
AC_MSG_CHECKING([for auto-import of symbols]) |
19 |
AC_CACHE_VAL([gl_cv_ld_autoimport], [ |
20 |
gl_save_LDFLAGS="$LDFLAGS" |
21 |
---- gentoo/gettext-0.19.7/gettext-tools/configure |
22 |
-+++ gentoo/gettext-0.19.7/gettext-tools/configure |
23 |
-@@ -9622,7 +9622,7 @@ |
24 |
+--- origsrc/gettext-0.19.7/gettext-runtime/configure |
25 |
++++ src/gettext-0.19.7/gettext-runtime/configure |
26 |
+@@ -7286,7 +7275,7 @@ |
27 |
|
28 |
|
29 |
case "$host_os" in |
30 |
@@ -42,27 +42,20 @@ Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll |
31 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
32 |
$as_echo_n "checking for auto-import of symbols... " >&6; } |
33 |
if ${gl_cv_ld_autoimport+:} false; then : |
34 |
-@@ -21863,7 +21863,7 @@ |
35 |
+--- origsrc/gettext-0.19.7/gettext-runtime/libasprintf/configure |
36 |
++++ src/gettext-0.19.7/gettext-runtime/libasprintf/configure |
37 |
+@@ -5479,7 +5467,7 @@ |
38 |
|
39 |
- if test "$enable_shared" = yes; then |
40 |
- case "$host_os" in |
41 |
-- mingw* | cygwin*) is_woe32dll=yes ;; |
42 |
-+ mingw*) is_woe32dll=yes ;; |
43 |
- *) is_woe32dll=no ;; |
44 |
- esac |
45 |
- else |
46 |
-@@ -71977,7 +71977,7 @@ |
47 |
|
48 |
- if test "$enable_shared" = yes; then |
49 |
case "$host_os" in |
50 |
-- mingw* | cygwin*) is_woe32dll=yes ;; |
51 |
-+ mingw*) is_woe32dll=yes ;; |
52 |
- *) is_woe32dll=no ;; |
53 |
- esac |
54 |
- else |
55 |
---- gentoo/gettext-0.19.7/gettext-runtime/configure |
56 |
-+++ gentoo/gettext-0.19.7/gettext-runtime/configure |
57 |
-@@ -7286,7 +7286,7 @@ |
58 |
+- mingw* | cygwin*) |
59 |
++ mingw*) |
60 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
61 |
+ $as_echo_n "checking for auto-import of symbols... " >&6; } |
62 |
+ if ${gl_cv_ld_autoimport+:} false; then : |
63 |
+--- origsrc/gettext-0.19.7/gettext-tools/configure |
64 |
++++ src/gettext-0.19.7/gettext-tools/configure |
65 |
+@@ -9622,7 +9611,7 @@ |
66 |
|
67 |
|
68 |
case "$host_os" in |
69 |
@@ -71,16 +64,16 @@ Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll |
70 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
71 |
$as_echo_n "checking for auto-import of symbols... " >&6; } |
72 |
if ${gl_cv_ld_autoimport+:} false; then : |
73 |
-@@ -19523,7 +19523,7 @@ |
74 |
+@@ -17726,7 +17715,7 @@ |
75 |
|
76 |
- if test "$enable_shared" = yes; then |
77 |
- case "$host_os" in |
78 |
-- mingw* | cygwin*) is_woe32dll=yes ;; |
79 |
-+ mingw*) is_woe32dll=yes ;; |
80 |
- *) is_woe32dll=no ;; |
81 |
- esac |
82 |
- else |
83 |
-@@ -31871,7 +31871,7 @@ |
84 |
+ |
85 |
+ case "$host_os" in |
86 |
+- mingw* | cygwin*) is_woe32=yes ;; |
87 |
++ mingw*) is_woe32=yes ;; |
88 |
+ *) is_woe32=no ;; |
89 |
+ esac |
90 |
+ if test $is_woe32 = yes; then |
91 |
+@@ -71977,7 +71966,7 @@ |
92 |
|
93 |
if test "$enable_shared" = yes; then |
94 |
case "$host_os" in |
95 |
@@ -89,14 +82,3 @@ Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll |
96 |
*) is_woe32dll=no ;; |
97 |
esac |
98 |
else |
99 |
---- gentoo/gettext-0.19.7/gettext-runtime/libasprintf/configure |
100 |
-+++ gentoo/gettext-0.19.7/gettext-runtime/libasprintf/configure |
101 |
-@@ -5479,7 +5479,7 @@ |
102 |
- |
103 |
- |
104 |
- case "$host_os" in |
105 |
-- mingw* | cygwin*) |
106 |
-+ mingw*) |
107 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
108 |
- $as_echo_n "checking for auto-import of symbols... " >&6; } |
109 |
- if ${gl_cv_ld_autoimport+:} false; then : |