Don't use cygpath.
authorRichard W.M. Jones <rjones@redhat.com>
Sun, 16 Nov 2008 10:23:32 +0000 (10:23 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Sun, 16 Nov 2008 10:23:32 +0000 (10:23 +0000)
flexdll/mingw32-flexdll-0.11-no-cygpath.patch [new file with mode: 0644]
flexdll/mingw32-flexdll.spec

diff --git a/flexdll/mingw32-flexdll-0.11-no-cygpath.patch b/flexdll/mingw32-flexdll-0.11-no-cygpath.patch
new file mode 100644 (file)
index 0000000..a7e00e0
--- /dev/null
@@ -0,0 +1,20 @@
+--- flexdll/reloc.ml.orig      2008-11-16 09:45:55.000000000 +0000
++++ flexdll/reloc.ml   2008-11-16 09:46:39.000000000 +0000
+@@ -938,7 +938,7 @@
+     parse_cmdline ();\r
+     setup_toolchain ();\r
\r
+-    use_cygpath :=\r
++    use_cygpath := false; (*\r
+       begin\r
+         match !toolchain, !cygpath_arg with\r
+         | _, `Yes -> true\r
+@@ -946,7 +946,7 @@
+         | (`CYGWIN|`MINGW), `None -> (Sys.command "cygpath -v 2>NUL >NUL" = 0)\r
+         | (`MSVC|`LIGHTLD), `None -> false\r
+       end;\r
+-\r
++                        *)\r
\r
+     if !verbose >= 2 then (\r
+       Printf.printf "** Use cygpath: %b\n" !use_cygpath;\r
index 92e7314..f744d9d 100644 (file)
@@ -11,7 +11,7 @@
 
 Name:           mingw32-flexdll
 Version:        0.11
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        FlexDLL Windows DLL plugin API which is like dlopen
 
 License:        zlib
@@ -23,6 +23,7 @@ Source1:        flexlink.exe
 
 # Patches for MinGW:
 Patch1000:      mingw32-flexdll-0.11-mingw-cross.patch
+Patch1001:      mingw32-flexdll-0.11-no-cygpath.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -71,6 +72,7 @@ make it easy to port applications developed for Unix.
 %setup -q -n flexdll
 
 %patch1000 -p1
+%patch1001 -p1
 
 for f in CHANGES LICENSE README; do
   chmod -x $f
@@ -127,5 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-6
+- Permanently disable cygpath (avoids 'NUL' file being created).
+
 * Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-4
 - Initial RPM release.