2 https://github.com/chef/omnibus-software/blob/master/config/patches/libffi/libffi-3.2.1-disable-multi-os-directory.patch
3 , this change will be included in the next libffi release.
5 --- libffi-3.2.1-orig/configure.ac 2014-11-12 05:56:51.000000000 -0600
6 +++ libffi-3.2.1/configure.ac 2015-10-29 15:53:41.695055040 -0500
8 AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
11 +AC_ARG_ENABLE(multi-os-directory,
12 +[ --disable-multi-os-directory
13 + disable use of gcc --print-multi-os-directory to change the library installation directory])
15 # These variables are only ever used when we cross-build to X86_WIN32.
16 # And we only support this with GCC, so...
17 if test "x$GCC" = "xyes"; then
19 toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
20 toolexeclibdir="${libdir}"
22 - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
23 - case $multi_os_directory in
24 - .) ;; # Avoid trailing /.
25 - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
27 + if test x"$enable_multi_os_directory" != x"no"; then
28 + multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
29 + case $multi_os_directory in
30 + .) ;; # Avoid trailing /.
31 + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
36 toolexeclibdir="${libdir}"
37 --- libffi-3.2.1-orig/configure 2014-11-12 11:59:57.000000000 +0000
38 +++ libffi-3.2.1/configure 2015-10-30 19:50:51.082221000 +0000
43 +enable_multi_os_directory
45 ac_precious_vars='build_alias
48 --disable-structs omit code for struct support
49 --disable-raw-api make the raw api unavailable
50 --enable-purify-safety purify-safe mode
51 + --disable-multi-os-directory
52 + disable use of gcc --print-multi-os-directory to change the library installation directory
55 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
56 @@ -18714,6 +18717,12 @@
60 +# Check whether --enable-multi-os-directory was given.
61 +if test "${enable_multi_os_directory+set}" = set; then :
62 + enableval=$enable_multi_os_directory;
66 # These variables are only ever used when we cross-build to X86_WIN32.
67 # And we only support this with GCC, so...
68 if test "x$GCC" = "xyes"; then
69 @@ -18725,11 +18734,13 @@
70 toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
71 toolexeclibdir="${libdir}"
73 - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
74 - case $multi_os_directory in
75 - .) ;; # Avoid trailing /.
76 - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
78 + if test x"$enable_multi_os_directory" != x"no"; then
79 + multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
80 + case $multi_os_directory in
81 + .) ;; # Avoid trailing /.
82 + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
87 toolexeclibdir="${libdir}"