!19 [patch tracking] 20201125083007628982
From: @openeuler-ci-bot Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
cce557ceba
61
e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch
Normal file
61
e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch
Normal file
@ -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"
|
||||||
@ -1,10 +1,11 @@
|
|||||||
Name: libffi
|
Name: libffi
|
||||||
Version: 3.3
|
Version: 3.3
|
||||||
Release: 9
|
Release: 10
|
||||||
Summary: A Portable Foreign Function Interface Library
|
Summary: A Portable Foreign Function Interface Library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://sourceware.org/libffi
|
URL: http://sourceware.org/libffi
|
||||||
Source0: ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
|
Source0: ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
|
||||||
|
Patch6000: e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch
|
||||||
|
|
||||||
BuildRequires: gcc gdb
|
BuildRequires: gcc gdb
|
||||||
|
|
||||||
@ -91,6 +92,9 @@ fi
|
|||||||
%{_infodir}/libffi.info.gz
|
%{_infodir}/libffi.info.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 20201125083007628982 patch-tracking 3.3-10
|
||||||
|
- append patch file of upstream repository from <e70bf987daa7b7b5df2de7579d5c51a888e8bf7d> to <e70bf987daa7b7b5df2de7579d5c51a888e8bf7d>
|
||||||
|
|
||||||
* Thu Jul 23 2020 Zhipeng Xie<xiezhipeng1@huawei.com> - 3.3-9
|
* Thu Jul 23 2020 Zhipeng Xie<xiezhipeng1@huawei.com> - 3.3-9
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user