Fixes for Windows
Olly Betts <[email protected]>
| Newsgroups | gmane.comp.sysutils.automake.patches |
|---|---|
| Message-ID | <[email protected]> |
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
0001-Use-cygpath-for-filename-conversion-on-MSYS.patch
(text/x-diff, 933 B)
From 91fb05a87c7a9eb784a84b14b74313740189c402 Mon Sep 17 00:00:00 2001 From: Olly Betts <[email protected]> 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
0002-lib-compile-Handle-libtool-.lo-files.patch
(text/x-diff, 753 B)
From 010511fe83a765238e0cb050621beee5a00fce69 Mon Sep 17 00:00:00 2001 From: Olly Betts <[email protected]> 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
signature.asc
(application/pgp-signature, 833 B)
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEECOJAD/f+j+3jrLUoGBR7BzutKwcFAlpn47YACgkQGBR7Bzut Kwc1WxAA2RqPcpR6wCZx2wBbPwuJwCC+fV3FUOxXvQgzCrwcNzbgsLN16px4zzn2 k1azZL9izoaYkXI0b5Supr1IhHs+DhLiFvxax8hYrRHrWIuBcaKKVvwHBRyFqEIQ fhMQ3tM950xc3AtVp5+EAunwZAZVa5RBiPeQ1Zh4JGdqfyR7fYT1UjJg6+rxx3Wh U0gQL5t6nWoDklAMN5FGe1D6ua/TeQIEhv05QGEQdY5I1XK/7bQLkzSLsGxQjY3d DMv2CDRijoPTaeavXdfbGEpYsUihDGrPpCXh0AYHrQRt/t9rrxsaZXg95CoLuHx5 QbkCmXUy8Y6QClr4vAcm/YPh44KkYJzrniUoUzSyOF2+0+kkHYVpXCGFthrMAMeO H70ZdNmUZSQEgExvWJqZU0PxxByiiWnFBySiFNRnP23vHNSFYW52mc7lHKSfh/Hh 0iC492vmnHaDfnHZg5EYVRu70Pe/DW3yVathvHB3a/9OdfY0WZs2zIPncgXnkmBm ywLibovBYOQorXFOlkbWjJF/oIp8dNa8tgp+RgY4j9Q2cEd+53C1TCCTFgAQFiDz mqs9uL7gvPOJUchUaaxY1IzMqJEx930jdTVT91UBowif3MbLzM+mYXpnGHVJgNvX msFX2yisdfXOKtGN8oLVJXBnAOshfqqQF8mH4F7X2o4kD9eU3G0= =/yZt -----END PGP SIGNATURE-----