annotate src/msvc-libffi-1.patch @ 3756:bb70aeee012e

qt.mk: Remove kluge for SuSE 10 systems that's not needed now that we are building our own X11 libraries.
author John W. Eaton <jwe@octave.org>
date Tue, 09 Dec 2014 22:10:45 -0500
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 ;;