Apply no-directory patch.

[fedora-mingw.git] / flexdll / mingw32-flexdll-0.11-no-directory.patch

diff --git a/flexdll/mingw32-flexdll-0.11-no-directory.patch b/flexdll/mingw32-flexdll-0.11-no-directory.patch
new file mode 100644 (file)
index 0000000..f990fe2
--- /dev/null
+++ b/flexdll/mingw32-flexdll-0.11-no-directory.patch
@@ -0,0 +1,16 @@
+Don't recognize directories as libraries.  eg. If we have system
+libvirt and OCaml bindings in $OCAML_LIB_DIR/libvirt, then we don't
+want '-lvirt' to "discover" the OCaml bindings directory.
+
+diff -ur flexdll/reloc.ml flexdll.mingw/reloc.ml
+--- flexdll/reloc.ml   2008-11-16 18:41:01.000000000 +0000
++++ flexdll.mingw/reloc.ml     2008-11-16 18:39:18.000000000 +0000
+@@ -109,7 +109,7 @@
+   Filename.dirname (get_output1 (Printf.sprintf "i686-pc-mingw32-gcc %s-print-libgcc-file-name" extra))\r
+ \r
+ let file_exists fn =\r
+-  if Sys.file_exists fn then Some fn\r
++  if Sys.file_exists fn && not (Sys.is_directory fn) then Some fn\r
+   else if !use_cygpath && Sys.file_exists (fn ^ ".lnk") then\r
+     Some (get_output1 (Printf.sprintf "cygpath -m %s" fn))\r
+   else None\r