diff --git a/e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch b/e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch new file mode 100644 index 0000000000000000000000000000000000000000..91fe66c633d259c452ab2e919d95835fa2ece4cc --- /dev/null +++ b/e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch @@ -0,0 +1,61 @@ +diff --git a/msvcc.sh b/msvcc.sh +index 97facd69..7cfc5097 100755 +--- a/msvcc.sh ++++ b/msvcc.sh +@@ -165,24 +165,24 @@ do + shift 1 + ;; + -I) +- p=$(cygpath -m $2) +- args="$args -I$p" +- includes="$includes -I$p" ++ p=$(cygpath -ma "$2") ++ args="$args -I\"$p\"" ++ includes="$includes -I\"$p\"" + shift 2 + ;; + -I*) +- p=$(cygpath -m ${1#-I}) +- args="$args -I$p" +- includes="$includes -I$p" ++ p=$(cygpath -ma "${1#-I}") ++ args="$args -I\"$p\"" ++ includes="$includes -I\"$p\"" + shift 1 + ;; + -L) +- p=$(cygpath -m $2) ++ p=$(cygpath -ma $2) + linkargs="$linkargs -LIBPATH:$p" + shift 2 + ;; + -L*) +- p=$(cygpath -m ${1#-L}) ++ p=$(cygpath -ma ${1#-L}) + linkargs="$linkargs -LIBPATH:$p" + shift 1 + ;; +@@ -256,12 +256,12 @@ do + shift 2 + ;; + *.S) +- src=$1 ++ src="$(cygpath -ma $1)" + assembly="true" + shift 1 + ;; + *.c) +- args="$args $1" ++ args="$args $(cygpath -ma $1)" + shift 1 + ;; + *) +@@ -312,7 +312,7 @@ if [ -n "$assembly" ]; then + echo "$cl -nologo -EP $includes $defines $src > $ppsrc" + fi + +- "$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $? ++ eval "\"$cl\" -nologo -EP $includes $defines $src" > $ppsrc || exit $? + output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')" + if [ $ml = "armasm" ]; then + args="-nologo -g -oldit $armasm_output $ppsrc -errorReport:prompt" diff --git a/libffi.spec b/libffi.spec index cdb35df6fdf7f437260ac982c06f76b9d59e2b23..735a438d37a07140fdc59ce250939259917da8be 100644 --- a/libffi.spec +++ b/libffi.spec @@ -1,10 +1,11 @@ Name: libffi Version: 3.3 -Release: 9 +Release: 10 Summary: A Portable Foreign Function Interface Library License: MIT URL: http://sourceware.org/libffi Source0: ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz +Patch6000: e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch BuildRequires: gcc gdb @@ -91,6 +92,9 @@ fi %{_infodir}/libffi.info.gz %changelog +* 20201125083007628982 patch-tracking 3.3-10 +- append patch file of upstream repository from to + * Thu Jul 23 2020 Zhipeng Xie - 3.3-9 - Type:bugfix - ID:NA @@ -152,4 +156,4 @@ fi - DESC:update to 3.2.1 * Mon Sep 09 2019 openEuler Buildteam - 3.1-19 -- Package init +- Package init \ No newline at end of file