[REVIEW 3-5] patch for later cygwins that have a different locaton for process.h

2012-02-21 Thread Noel Power
There is a real sucky problem that will especially affect new Windows 
libreoffice developers, namely *real* early there is a big fat build 
failure. I came across this as I completely started from scratch 
creating a build environment [*]  ( as I managed to bork my windows xp 
installation ) Attached is a patch, probably there is a better way to do 
this but I don't really have a clue about autoconf/configure type stuff 
and this fix was the easiest for me. It would be great to get this into 
3.5 branch and this is what we specifically point windows people to ( on 
the list and irc anyway ).
Note: I didn't attach the generated ( but still under git ) configure a 
my autoconf is 1.68 and the previous version used to produce configure 
was 1.62. I guess it's not so bad I shouldn't push to master anyway right?


Noel

[*] btw this was a great opportunity to check out the instructions at 
http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies which 
I found to be spot on. Ok I have some experience building libreoffice on 
windows  and I used the non-free compiler but really I found those 
instructions quite good and accurate
diff --git a/dmake/configure.in b/dmake/configure.in
index c196413..d82c889 100755
--- a/dmake/configure.in
+++ b/dmake/configure.in
@@ -189,7 +189,7 @@ dnl Initialize libtool
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h)
+AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h cygwin/process.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4e87862..bd961a7 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -125,6 +125,9 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If
 #endif
 
 #if __CYGWIN__  ENABLE_SPAWN
+#if HAVE_CYGWIN_PROCESS_H
+#  include cygwin/process.h
+#else
 #  include process.h
 #endif
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [REVIEW 3-5] patch for later cygwins that have a different locaton for process.h

2012-02-21 Thread Noel Power

On 21/02/12 11:50, Noel Power wrote:
There is a real sucky problem that will especially affect new Windows 
libreoffice developers, namely *real* early there is a big fat build 
failure. I came across this as I completely started from scratch 
creating a build environment [*]  ( as I managed to bork my windows xp 
installation ) Attached is a patch, probably there is a better way to 
do this but I don't really have a clue about autoconf/configure type 
stuff and this fix was the easiest for me. It would be great to get 
this into 3.5 branch and this is what we specifically point windows 
people to ( on the list and irc anyway ).
Note: I didn't attach the generated ( but still under git ) configure 
a my autoconf is 1.68 and the previous version used to produce 
configure was 1.62. I guess it's not so bad I shouldn't push to master 
anyway right?


Noel

[*] btw this was a great opportunity to check out the instructions at 
http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies 
which I found to be spot on. Ok I have some experience building 
libreoffice on windows  and I used the non-free compiler but really I 
found those instructions quite good and accurate



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
oops, seems I deleted a line sometime between compiling and generating 
the patch


Noel
diff --git a/dmake/configure.in b/dmake/configure.in
index c196413..d82c889 100755
--- a/dmake/configure.in
+++ b/dmake/configure.in
@@ -189,7 +189,7 @@ dnl Initialize libtool
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h)
+AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h cygwin/process.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4e87862..cc78560 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -125,8 +125,12 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If
 #endif
 
 #if __CYGWIN__  ENABLE_SPAWN
+#if HAVE_CYGWIN_PROCESS_H
+#  include cygwin/process.h
+#else
 #  include process.h
 #endif
+#endif
 
 #ifdef __EMX__
 #  include process.h
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice