73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
diff -Naur util-linux-2.24.2-orig/config/compile util-linux-2.24.2/config/compile
|
|
--- util-linux-2.24.2-orig/config/compile 2013-08-05 14:10:38.000000000 +0400
|
|
+++ util-linux-2.24.2/config/compile 2014-10-13 12:04:25.132000000 +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 util-linux-2.24.2-orig/config/config.guess util-linux-2.24.2/config/config.guess
|
|
--- util-linux-2.24.2-orig/config/config.guess 2013-08-05 14:10:38.000000000 +0400
|
|
+++ util-linux-2.24.2/config/config.guess 2014-10-13 12:04:57.736000000 +0400
|
|
@@ -849,6 +849,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 ;;
|
|
--- util-linux-2.24.2/config/config.rpath.orig 2014-10-13 12:14:54.893800000 +0400
|
|
+++ util-linux-2.24.2/config/config.rpath 2014-10-13 12:15:44.283000000 +0400
|
|
@@ -109,7 +109,7 @@
|
|
hardcode_minus_L=no
|
|
|
|
case "$host_os" in
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# 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++.
|
|
@@ -149,7 +149,7 @@
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -268,7 +268,7 @@
|
|
;;
|
|
bsdi4*)
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -440,7 +440,7 @@
|
|
;;
|
|
bsdi4*)
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
shrext=.dll
|
|
;;
|
|
darwin* | rhapsody*)
|