Files
MSYS2-packages/p11-kit/0100-msysize.patch
2019-01-24 09:54:42 +03:00

83 lines
2.7 KiB
Diff

diff -Naur p11-kit-0.23.7-orig/build/litter/compile p11-kit-0.23.7/build/litter/compile
--- p11-kit-0.23.7-orig/build/litter/compile 2017-06-01 14:33:15.000000000 +0300
+++ p11-kit-0.23.7/build/litter/compile 2017-09-12 12:09:04.522859800 +0300
@@ -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 p11-kit-0.23.7-orig/build/litter/config.guess p11-kit-0.23.7/build/litter/config.guess
--- p11-kit-0.23.7-orig/build/litter/config.guess 2017-06-01 14:33:15.000000000 +0300
+++ p11-kit-0.23.7/build/litter/config.guess 2017-09-12 12:10:19.228132700 +0300
@@ -867,6 +867,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
diff -Naur p11-kit-0.23.7-orig/build/litter/config.rpath p11-kit-0.23.7/build/litter/config.rpath
--- p11-kit-0.23.7-orig/build/litter/config.rpath 2017-06-01 14:33:03.000000000 +0300
+++ p11-kit-0.23.7/build/litter/config.rpath 2017-09-12 12:09:52.275591100 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,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++.
@@ -198,7 +198,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'
@@ -348,7 +348,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
@@ -533,7 +533,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'
;;