From: Bruno Haible <bruno@clisp.org>
Date: Tue, 18 Sep 2018 09:33:58 +0000 (+0200)
Subject: Fix link error when building with --disable-shared on 64-bit Cygwin.
X-Git-Tag: v0.20~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ca8fde880e1a712c648ea41231b6f6364ecb7b;p=thirdparty%2Fgettext.git

Fix link error when building with --disable-shared on 64-bit Cygwin.

* gnulib-local/lib/execute.c.diff: Remove file.
* gnulib-local/lib/spawn-pipe.c.diff: Remove file.
* gnulib-local/tests/test-environ.c.diff: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove them.
---

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 63e2ec016..4ce75983b 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -34,7 +34,6 @@ lib/diffseq.h.diff \
 lib/error.h.diff \
 lib/error-progname.c \
 lib/error-progname.h \
-lib/execute.c.diff \
 lib/exitfail.h.diff \
 lib/fd-ostream.oo.c \
 lib/fd-ostream.oo.h \
@@ -234,7 +233,6 @@ lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
 lib/regex_internal.h.diff \
-lib/spawn-pipe.c.diff \
 lib/styled-ostream.oo.c \
 lib/styled-ostream.oo.h \
 lib/termcap.h \
@@ -300,7 +298,6 @@ modules/xalloc \
 modules/xalloc-die \
 modules/xerror \
 modules/xgetcwd \
-tests/test-environ.c.diff \
 tests/test-moo-aroot.oo.c \
 tests/test-moo-aroot.oo.h \
 tests/test-moo-assign.c \
diff --git a/gnulib-local/lib/execute.c.diff b/gnulib-local/lib/execute.c.diff
deleted file mode 100644
index 27b1ed4a3..000000000
--- a/gnulib-local/lib/execute.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/execute.c b/execute.c
-index 15a487b..489abf5 100644
---- a/execute.c
-+++ b/execute.c
-@@ -48,6 +48,13 @@
- 
- #endif
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- 
- #if defined EINTR && (defined _WIN32 && ! defined __CYGWIN__)
- 
diff --git a/gnulib-local/lib/spawn-pipe.c.diff b/gnulib-local/lib/spawn-pipe.c.diff
deleted file mode 100644
index 0ae732208..000000000
--- a/gnulib-local/lib/spawn-pipe.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/spawn-pipe.c b/spawn-pipe.c
-index 656980d..b7fa95b 100644
---- a/spawn-pipe.c
-+++ b/spawn-pipe.c
-@@ -48,6 +48,13 @@
- 
- #endif
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- 
- #ifdef EINTR
- 
diff --git a/gnulib-local/tests/test-environ.c.diff b/gnulib-local/tests/test-environ.c.diff
deleted file mode 100644
index 6cc8f68a7..000000000
--- a/gnulib-local/tests/test-environ.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/test-environ.c b/test-environ.c
-index 46a2eab..8afecb7 100644
---- a/test-environ.c
-+++ b/test-environ.c
-@@ -22,6 +22,13 @@
- 
- #include <string.h>
- 
-+/* environ is the exported symbol referencing the internal
-+   __cygwin_environ variable on cygwin64:
-+   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
-+#if defined __CYGWIN__ && defined __x86_64__
-+extern DLL_VARIABLE char **environ;
-+#endif
-+
- int
- main ()
- {