commit: 1954f9694b2c77917e70b4b901708bf8d4eda451
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer
<DOT> com>
AuthorDate: Wed May 25 08:31:30 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed May 25 08:39:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1954f969
sys-devel/gettext: fix cygwin patch
sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch | 64 ++++++++--------------
1 file changed, 23 insertions(+), 41 deletions(-)
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
index f28a7a9..3f2e4c4 100644
--- a/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch
+++ b/sys-devel/gettext/files/0.18.1.1-no-woe32dll.patch
@@ -31,9 +31,9 @@ Derived from Cygwin: gettext-0.19.7-1.src/0.18.1.1-no-woe32dll
AC_MSG_CHECKING([for auto-import of symbols])
AC_CACHE_VAL([gl_cv_ld_autoimport], [
gl_save_LDFLAGS="$LDFLAGS"
---- gentoo/gettext-0.19.7/gettext-tools/configure
-+++ gentoo/gettext-0.19.7/gettext-tools/configure
-@@ -9622,7 +9622,7 @@
+--- origsrc/gettext-0.19.7/gettext-runtime/configure
++++ src/gettext-0.19.7/gettext-runtime/configure
+@@ -7286,7 +7275,7 @@
case "$host_os" in
@@ -42,27 +42,20 @@ Derived from Cygwin:
gettext-0.19.7-1.src/0.18.1.1-no-woe32dll
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of
symbols" >&5
$as_echo_n "checking for auto-import of symbols... " >&6; }
if ${gl_cv_ld_autoimport+:} false; then :
-@@ -21863,7 +21863,7 @@
+--- origsrc/gettext-0.19.7/gettext-runtime/libasprintf/configure
++++ src/gettext-0.19.7/gettext-runtime/libasprintf/configure
+@@ -5479,7 +5467,7 @@
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
-@@ -71977,7 +71977,7 @@
- if test "$enable_shared" = yes; then
case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
---- gentoo/gettext-0.19.7/gettext-runtime/configure
-+++ gentoo/gettext-0.19.7/gettext-runtime/configure
-@@ -7286,7 +7286,7 @@
+- mingw* | cygwin*)
++ mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of
symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+ if ${gl_cv_ld_autoimport+:} false; then :
+--- origsrc/gettext-0.19.7/gettext-tools/configure
++++ src/gettext-0.19.7/gettext-tools/configure
+@@ -9622,7 +9611,7 @@
case "$host_os" in
@@ -71,16 +64,16 @@ Derived from Cygwin:
gettext-0.19.7-1.src/0.18.1.1-no-woe32dll
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of
symbols" >&5
$as_echo_n "checking for auto-import of symbols... " >&6; }
if ${gl_cv_ld_autoimport+:} false; then :
-@@ -19523,7 +19523,7 @@
+@@ -17726,7 +17715,7 @@
- if test "$enable_shared" = yes; then
- case "$host_os" in
-- mingw* | cygwin*) is_woe32dll=yes ;;
-+ mingw*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
-@@ -31871,7 +31871,7 @@
+
+ case "$host_os" in
+- mingw* | cygwin*) is_woe32=yes ;;
++ mingw*) is_woe32=yes ;;
+ *) is_woe32=no ;;
+ esac
+ if test $is_woe32 = yes; then
+@@ -71977,7 +71966,7 @@
if test "$enable_shared" = yes; then
case "$host_os" in
@@ -89,14 +82,3 @@ Derived from Cygwin:
gettext-0.19.7-1.src/0.18.1.1-no-woe32dll
*) is_woe32dll=no ;;
esac
else
---- gentoo/gettext-0.19.7/gettext-runtime/libasprintf/configure
-+++ gentoo/gettext-0.19.7/gettext-runtime/libasprintf/configure
-@@ -5479,7 +5479,7 @@
-
-
- case "$host_os" in
-- mingw* | cygwin*)
-+ mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of
symbols" >&5
- $as_echo_n "checking for auto-import of symbols... " >&6; }
- if ${gl_cv_ld_autoimport+:} false; then :
