webkitgtk-2.4.8-gcc5.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334
  1. diff -up webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4
  2. --- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100
  3. +++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100
  4. @@ -87,12 +87,12 @@ AC_SYS_LARGEFILE
  5. c_compiler="unknown"
  6. AC_LANG_PUSH([C])
  7. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  8. -#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
  9. +#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
  10. #error Not a supported GCC compiler
  11. #endif
  12. ])], [c_compiler="gcc"], [])
  13. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  14. -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
  15. +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  16. #error Not a supported Clang compiler
  17. #endif
  18. ])], [c_compiler="clang"], [])
  19. @@ -106,12 +106,12 @@ fi
  20. cxx_compiler="unknown"
  21. AC_LANG_PUSH([C++])
  22. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  23. -#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
  24. +#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
  25. #error Not a supported G++ compiler
  26. #endif
  27. ])], [cxx_compiler="g++"], [])
  28. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  29. -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
  30. +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  31. #error Not a supported Clang++ compiler
  32. #endif
  33. ])], [cxx_compiler="clang++"], [])