002-fix-toolexeclibdir-path.patch 1.2 KB

12345678910111213141516171819202122232425262728293031
  1. diff -rupN libffi-3.2.1.orig/configure libffi-3.2.1/configure
  2. --- libffi-3.2.1.orig/configure 2014-11-12 12:59:57.000000000 +0100
  3. +++ libffi-3.2.1/configure 2016-05-11 17:14:58.606625260 +0200
  4. @@ -18725,12 +18725,6 @@ if test "x$GCC" = "xyes"; then
  5. toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
  6. toolexeclibdir="${libdir}"
  7. fi
  8. - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
  9. - case $multi_os_directory in
  10. - .) ;; # Avoid trailing /.
  11. - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
  12. - esac
  13. -
  14. else
  15. toolexeclibdir="${libdir}"
  16. fi
  17. diff -rupN libffi-3.2.1.orig/configure.ac libffi-3.2.1/configure.ac
  18. --- libffi-3.2.1.orig/configure.ac 2014-11-12 12:56:51.000000000 +0100
  19. +++ libffi-3.2.1/configure.ac 2016-05-11 17:15:19.694626266 +0200
  20. @@ -601,11 +601,6 @@ if test "x$GCC" = "xyes"; then
  21. toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
  22. toolexeclibdir="${libdir}"
  23. fi
  24. - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
  25. - case $multi_os_directory in
  26. - .) ;; # Avoid trailing /.
  27. - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
  28. - esac
  29. AC_SUBST(toolexecdir)
  30. else
  31. toolexeclibdir="${libdir}"