I found I needed the two attached patches to build Xapian
(https://xapian.org) on Windows.

The second patch is only needed when using libtool, but should
be harmless when not.

Cheers,
    Olly
From 91fb05a87c7a9eb784a84b14b74313740189c402 Mon Sep 17 00:00:00 2001
From: Olly Betts <o...@survex.com>
Date: Wed, 24 Jan 2018 13:38:03 +1300
Subject: [PATCH 1/2] Use cygpath for filename conversion on MSYS

* lib/ar-lib(func_file_conv): Set file_conv=cygwin for MSYS.
* lib/compile(func_file_conv): Likewise.
---
 lib/ar-lib  | 2 +-
 lib/compile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ar-lib b/lib/ar-lib
index 0baa4f60..bb36b0c4 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
diff --git a/lib/compile b/lib/compile
index 0bb9d0f5..7851f7c4 100755
--- a/lib/compile
+++ b/lib/compile
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
-- 
2.15.1

From 010511fe83a765238e0cb050621beee5a00fce69 Mon Sep 17 00:00:00 2001
From: Olly Betts <o...@survex.com>
Date: Wed, 24 Jan 2018 13:43:42 +1300
Subject: [PATCH 2/2] lib/compile: Handle libtool .lo files

* lib/compile(func_cl_wrapper): Add *.lo to list of files to handle
as object files.
---
 lib/compile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compile b/lib/compile
index 7851f7c4..e2931cf9 100755
--- a/lib/compile
+++ b/lib/compile
@@ -143,7 +143,7 @@ func_cl_wrapper ()
 	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
 	  eat=1
 	  case $2 in
-	    *.o | *.[oO][bB][jJ])
+	    *.o | *.lo | *.[oO][bB][jJ])
 	      func_file_conv "$2"
 	      set x "$@" -Fo"$file"
 	      shift
-- 
2.15.1

Attachment: signature.asc
Description: PGP signature

Reply via email to