OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

42 lines
2.2 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../cmake/uname.patch.disabled
  5. # Copyright (C) 2006 - 2010 The OpenSDE Project
  6. # Copyright (C) 2006 The T2 SDE Project
  7. #
  8. # More information can be found in the files COPYING and README.
  9. #
  10. # This patch file is dual-licensed. It is available under the license the
  11. # patched project is licensed under, as long as it is an OpenSource license
  12. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13. # of the GNU General Public License as published by the Free Software
  14. # Foundation; either version 2 of the License, or (at your option) any later
  15. # version.
  16. # --- SDE-COPYRIGHT-NOTE-END ---
  17. diff -Nur cmake-2.6.1-orig/Modules/CMakeDetermineSystem.cmake cmake-2.6.1/Modules/CMakeDetermineSystem.cmake
  18. --- cmake-2.6.1-orig/Modules/CMakeDetermineSystem.cmake 2008-08-31 11:22:20.000000000 +0200
  19. +++ cmake-2.6.1/Modules/CMakeDetermineSystem.cmake 2008-08-31 11:25:26.000000000 +0200
  20. @@ -31,16 +31,16 @@
  21. IF(CMAKE_HOST_UNIX)
  22. FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
  23. IF(CMAKE_UNAME)
  24. - EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
  25. - EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
  26. + EXEC_PROGRAM(uname ARGS -s 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
  27. + EXEC_PROGRAM(uname ARGS -r 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
  28. IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
  29. - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  30. + EXEC_PROGRAM(uname ARGS -m 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  31. RETURN_VALUE val)
  32. ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
  33. - EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  34. + EXEC_PROGRAM(uname ARGS -p 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  35. RETURN_VALUE val)
  36. IF("${val}" GREATER 0)
  37. - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  38. + EXEC_PROGRAM(uname ARGS -m 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
  39. RETURN_VALUE val)
  40. ENDIF("${val}" GREATER 0)
  41. ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")