0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 4f1c6784b37a11c78fe84bb238fb7cc377ce0d36 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
  3. Date: Wed, 30 Mar 2016 23:28:33 +0200
  4. Subject: [PATCH] Fix for uClibc and gcc <= 4.8.2
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. getchar() is defined as a macro in uClibc. This hits gcc bug 58952 [1] for all
  9. gcc version <= 4.8.2 and building boost/test fails:
  10. ./boost/test/impl/unit_test_main.ipp: In function 'int boost::unit_test::unit_test_main(boost::unit_test::init_unit_test_func, int, char**)':
  11. ./boost/test/impl/unit_test_main.ipp:194:18: error: expected unqualified-id before '(' token
  12. To allow building boost/test with uClibc based toolchains with gcc <= 4.8.2 use
  13. parenthesis for std::getchar.
  14. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58952
  15. Upstream status: Pending
  16. https://github.com/boostorg/test/pull/97
  17. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  18. ---
  19. include/boost/test/impl/unit_test_main.ipp | 4 +++-
  20. 1 file changed, 3 insertions(+), 1 deletion(-)
  21. diff --git a/boost/test/impl/unit_test_main.ipp b/boost/test/impl/unit_test_main.ipp
  22. index 1f30c02..db61930 100644
  23. --- a/boost/test/impl/unit_test_main.ipp
  24. +++ b/boost/test/impl/unit_test_main.ipp
  25. @@ -191,7 +191,9 @@ unit_test_main( init_unit_test_func init_func, int argc, char* argv[] )
  26. if( runtime_config::get<bool>( runtime_config::WAIT_FOR_DEBUGGER ) ) {
  27. results_reporter::get_stream() << "Press any key to continue..." << std::endl;
  28. - std::getchar();
  29. + // getchar is defined as a macro in uClibc. Use parenthesis to fix
  30. + // gcc bug 58952 for gcc <= 4.8.2.
  31. + (std::getchar)();
  32. results_reporter::get_stream() << "Continuing..." << std::endl;
  33. }
  34. --
  35. 2.7.4