* libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src) [file

scope]: additional #includes and #defines to support...
(func_emit_cwrapperexe_src) [main]: ensure stdout is set to
binary mode for cygwin|mingw builds. Ensure temporary script
file is written in binary mode for cygwin|mingw builds.
(func_mode_link) [cygwin|mingw]: cross-build support - only
use cwrapper to generate shell wrapper if building native;
otherwise use func_emit_wrapper()

diff --git a/ChangeLog b/ChangeLog
index 9418c568af0f7802c3c71dbe41c068aece2ccc07..150a1e746d83f4686521f32378fe2022c2a0eb2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-03-12  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+       * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src) [file
+       scope]: additional #includes and #defines to support...
+       (func_emit_cwrapperexe_src) [main]: ensure stdout is set to
+       binary mode for cygwin|mingw builds. Ensure temporary script
+       file is written in binary mode for cygwin|mingw builds.
+       (func_mode_link) [cygwin|mingw]: cross-build support - only
+       use cwrapper to generate shell wrapper if building native;
+       otherwise use func_emit_wrapper()
+
 2008-03-12  Henning Nielsen Lund  <hnl_dk@amigaos.dk>
 
        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index ade8b45059a7c777bda8aaf405991f2637e2724c..9ccb0203ba3f06ac4dba239350254b09b488a351 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -2517,6 +2517,7 @@ EOF
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
+# include <io.h>
 #else
 # include <unistd.h>
 # include <stdint.h>
@@ -2527,6 +2528,7 @@ EOF
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #if defined(PATH_MAX)
@@ -2560,6 +2562,7 @@ EOF
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
 # define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
 #  define DIR_SEPARATOR_2 '\\'
 # endif
@@ -2581,6 +2584,17 @@ EOF
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
   if (stale) { free ((void *) stale); stale = 0; } \
@@ -2646,6 +2660,15 @@ main (int argc, char *argv[])
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
        {
+EOF
+           case "$host" in
+             *mingw* | *cygwin* )
+               # make stdout use "unix" line endings
+               echo "          _setmode(1,_O_BINARY);"
+               ;;
+             esac
+
+           cat <<EOF
          printf ("%s", script_text);
          return 0;
        }
@@ -2733,10 +2756,8 @@ EOF
   XFREE (shwrapper_name);
   XFREE (actual_cwrapper_path);
 
-  /* note: do NOT use "wt" here! -- defer to underlying
-   * mount type on cygwin
-   */
-  if ((shwrapper = fopen (newargz[1], "w")) == 0)
+  /* always write in binary mode */
+  if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
     {
       lt_fatal ("Could not open %s for writing", newargz[1]);
     }
@@ -6830,7 +6851,12 @@ EOF
            $RM $func_ltwrapper_scriptname_result
            trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
            $opt_dry_run || {
-             $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+             # note: this script will not be executed, so do not chmod.
+             if test "x$build" = "x$host" ; then
+               $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+             else
+               func_emit_wrapper no > $func_ltwrapper_scriptname_result
+             fi
            }
          ;;
          * )