annotate src/msvc-libffi-1.patch @ 6113:24e29dcb2e64

Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 1a25ea16434b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3131
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur libffi-3.0.11-orig/configure libffi-3.0.11/configure
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- libffi-3.0.11-orig/configure 2012-04-11 23:13:17 -0400
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ libffi-3.0.11/configure 2013-07-12 11:13:45 -0400
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -14572,7 +14572,7 @@
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 toolexeclibdir='$(libdir)'
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 fi
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - multi_os_directory=`$CC -print-multi-os-directory`
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + #multi_os_directory=`$CC -print-multi-os-directory`
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 case $multi_os_directory in
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 .) ;; # Avoid trailing /.
1a25ea16434b [MSVC] enable libffi compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;