build: Handle 'environ' global variable differently on cygwin x86_64

Problem reported by Vasyl Khalak in:
<https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.
* lib/execute.c.diff: New file.
* lib/spawn-pipe.c.diff: Likewise.
* Makefile.am (EXTRA_DIST): Add new patches.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 15333d7d9e15e4c2a817359996f23b1ad90cc8db..1bfd56fc73cf5c7aa1124bd33d447ec16079916b 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-02  Daiki Ueno  <ueno@gnu.org>
+
+       build: Handle 'environ' global variable differently on cygwin x86_64
+       Problem reported by Vasyl Khalak in:
+       <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.
+       * lib/execute.c.diff: New file.
+       * lib/spawn-pipe.c.diff: Likewise.
+       * Makefile.am (EXTRA_DIST): Add new patches.
+
 2014-05-14  Daiki Ueno  <ueno@gnu.org>
 
        Update after gnulib changed.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 6d95f12b069a4079bdec9c69edf154042e2cc738..1cde518d97dab55585a8cddab15560e4d077d687 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -36,6 +36,7 @@ lib/error.h.diff \
 lib/error-progname.c \
 lib/error-progname.h \
 lib/exitfail.h.diff \
+lib/execute.c.diff \
 lib/fd-ostream.oo.c \
 lib/fd-ostream.oo.h \
 lib/file-ostream.oo.c \
@@ -227,6 +228,7 @@ lib/ostream.oo.h \
 lib/progname.h.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
+lib/spawn-pipe.c.diff \
 lib/styled-ostream.oo.c \
 lib/styled-ostream.oo.h \
 lib/term-ostream.oo.c \

diff --git a/gnulib-local/lib/execute.c.diff b/gnulib-local/lib/execute.c.diff
new file mode 100644 (file)
index 0000000..8f849d2
--- /dev/null
+++ b/gnulib-local/lib/execute.c.diff
@@ -0,0 +1,18 @@
+diff --git a/execute.c b/execute.c
+index e7b4496..1c342da 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
++
+ /* The results of open() in this file are not used with fchdir,
+    therefore save some unnecessary work in fchdir.c.  */
+ #undef open

diff --git a/gnulib-local/lib/spawn-pipe.c.diff b/gnulib-local/lib/spawn-pipe.c.diff
new file mode 100644 (file)
index 0000000..12a9825
--- /dev/null
+++ b/gnulib-local/lib/spawn-pipe.c.diff
@@ -0,0 +1,18 @@
+diff --git a/spawn-pipe.c b/spawn-pipe.c
+index b3f9e0c..965fb3a 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
++
+ /* The results of open() in this file are not used with fchdir,
+    therefore save some unnecessary work in fchdir.c.  */
+ #undef open