113 lines
3.6 KiB
Diff
113 lines
3.6 KiB
Diff
diff -Naur xz-5.0.5/build-aux/compile xz-5.0.5-msys2/build-aux/compile
|
|
--- xz-5.0.5/build-aux/compile 2013-06-30 17:17:56.000000000 +0400
|
|
+++ xz-5.0.5-msys2/build-aux/compile 2013-07-03 09:05:25.586914000 +0400
|
|
@@ -53,7 +53,7 @@
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
- CYGWIN*)
|
|
+ CYGWIN* | MSYS*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
@@ -67,7 +67,7 @@
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
- cygwin/*)
|
|
+ cygwin/* | msys*/)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
diff -Naur xz-5.0.5/build-aux/config.guess xz-5.0.5-msys2/build-aux/config.guess
|
|
--- xz-5.0.5/build-aux/config.guess 2013-06-30 17:17:56.000000000 +0400
|
|
+++ xz-5.0.5-msys2/build-aux/config.guess 2013-07-03 09:05:25.586914000 +0400
|
|
@@ -866,6 +866,9 @@
|
|
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
|
echo x86_64-unknown-cygwin
|
|
exit ;;
|
|
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
|
+ echo x86_64-unknown-msys
|
|
+ exit ;;
|
|
p*:CYGWIN*:*)
|
|
echo powerpcle-unknown-cygwin
|
|
exit ;;
|
|
diff -Naur xz-5.0.5/build-aux/config.rpath xz-5.0.5-msys2/build-aux/config.rpath
|
|
--- xz-5.0.5/build-aux/config.rpath 2013-06-30 17:17:38.000000000 +0400
|
|
+++ xz-5.0.5-msys2/build-aux/config.rpath 2013-07-03 09:11:10.618164000 +0400
|
|
@@ -64,7 +64,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
wl='-Wl,'
|
|
@@ -138,7 +138,7 @@
|
|
hardcode_minus_L=no
|
|
|
|
case "$host_os" in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -188,7 +188,7 @@
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -332,7 +332,7 @@
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -523,7 +523,7 @@
|
|
bsdi[45]*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
shrext=.dll
|
|
library_names_spec='$libname.dll.a $libname.lib'
|
|
;;
|
|
diff -Naur xz-5.0.5/configure.ac xz-5.0.5-msys2/configure.ac
|
|
--- xz-5.0.5/configure.ac 2013-06-30 16:49:46.000000000 +0400
|
|
+++ xz-5.0.5-msys2/configure.ac 2013-07-03 09:05:25.711914000 +0400
|
|
@@ -34,7 +34,7 @@
|
|
|
|
# We do some special things on Windows (32-bit or 64-bit) builds.
|
|
case $host_os in
|
|
- mingw* | cygwin*) is_w32=yes ;;
|
|
+ mingw* | cygwin* | msys*) is_w32=yes ;;
|
|
*) is_w32=no ;;
|
|
esac
|
|
AM_CONDITIONAL([COND_W32], [test "$is_w32" = yes])
|
|
@@ -44,7 +44,7 @@
|
|
# that symlinks don't have the .exe suffix. To make this work, we
|
|
# define LN_EXEEXT.
|
|
case $host_os in
|
|
- cygwin) LN_EXEEXT= ;;
|
|
+ cygwin | msys) LN_EXEEXT= ;;
|
|
*) LN_EXEEXT='$(EXEEXT)' ;;
|
|
esac
|
|
AC_SUBST([LN_EXEEXT])
|
|
@@ -283,7 +283,7 @@
|
|
case $host_os in
|
|
# Darwin should work too but only if not creating universal
|
|
# binaries. Solaris x86 could work too but I cannot test.
|
|
- linux* | *bsd* | mingw* | cygwin* | *djgpp*)
|
|
+ linux* | *bsd* | mingw* | cygwin* | msys* | *djgpp*)
|
|
case $host_cpu in
|
|
i?86) enable_assembler=x86 ;;
|
|
x86_64) enable_assembler=x86_64 ;;
|