Startsida Utforska Hjälp
Logga in
PUBLIC_REPOS
/
buildroot
spegling av git://git.buildroot.net/buildroot
2
1
Fork 0
Filer
Träd: 056c9d28c4
Grenar Taggar
buildroot
/
package
/
openpowerlink
/
0001-fix-use-a-better-regex-for-cmake-system-processor.patch

0001-fix-use-a-better-regex-for-cmake-system-processor.patch 4.1 KB
Historik Rå

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 
  1. From 9fd3aef2f9bb7a2b05b6823281bb5c988fa25149 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Romain Naour <romain.naour@openwide.fr>
    3. 

  3. Date: Mon, 17 Nov 2014 23:27:05 +0100
    4. 

  4. Subject: [PATCH 1/2] [FIX] use a better regex for CMAKE_SYSTEM_PROCESSOR
    5. 

  5. 

  6. According to CMake doc, CMAKE_SYSTEM_PROCESSOR is set to the
    7. 

  7. output of the command "uname -p" (in fact it is the output of "uname
    8. 

  8. -m"). This is only true for native compilation.
    9. 

  9. 

  10. In the case of cross-compilation, the CMake code does not set anything,
    11. 

  11. it just expects the CMAKE_SYSTEM_* variables to be set in the
    12. 

  12. toolchain file.
    13. 

  13. 

  14. Add a test matching the patern "^i.86$" and keep the old one "x86" for
    15. 

  15. compatibility.
    16. 

  16. By doing that, factorize this test using "^(i.86|x86(_64)?)$".
    17. 

  17. 

  18. Thanks to Samuel Martin [1]
    19. 

  19. [1] http://lists.busybox.net/pipermail/buildroot/2014-November/112163.html
    20. 

  20. 

  21. Signed-off-by: Romain Naour <romain.naour@openwide.fr>
    22. 

  22. ---
    23. 

  23.  Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt         | 15 ++++-----------
    24. 

  24.  .../X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt  | 15 ++++-----------
    25. 

  25.  2 files changed, 8 insertions(+), 22 deletions(-)
    26. 

  26. 

  27. diff --git a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
    28. 

  28. index 271ecdc..b49ef53 100644
    29. 

  29. --- a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
    30. 

  30. +++ b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
    31. 

  31. @@ -154,21 +154,14 @@ SET(MODULE_SOURCE_FILES
    32. 

  32.      ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/Objdict.c
    33. 

  33.  )
    34. 

  34.  
    35. 

  35. -IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    36. 

  36. +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    37. 

  37.      SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
    38. 

  38. -
    39. 

  39. -ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL arm
    40. 

  40. -        OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
    41. 

  41. +ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
    42. 

  42.      SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)
    43. 

  43. -
    44. 

  44. -ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL i686
    45. 

  45. -    OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
    46. 

  46. -    SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
    47. 

  47. -
    48. 

  48. -ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    49. 

  49. +ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    50. 

  50.      MESSAGE(FATAL_ERROR
    51. 

  51.              "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")
    52. 

  52. -ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    53. 

  53. +ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    54. 

  54.  
    55. 

  55.  SET(MODULE_FILE
    56. 

  56.      ${MODULE_NAME}.ko
    57. 

  57. diff --git a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
    58. 

  58. index 1b47c76..f534a4d 100644
    59. 

  59. --- a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
    60. 

  60. +++ b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
    61. 

  61. @@ -171,21 +171,14 @@ ELSE(CFG_POWERLINK_EDRV STREQUAL "I210")
    62. 

  62.      SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/Target/X86/Linux/gnu/generic/TimerHighReskX86.c)
    63. 

  63.  ENDIF(CFG_POWERLINK_EDRV STREQUAL "I210")
    64. 

  64.  
    65. 

  65. -IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    66. 

  66. +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    67. 

  67.      SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
    68. 

  68. -
    69. 

  69. -ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL arm
    70. 

  70. -        OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
    71. 

  71. +ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
    72. 

  72.      SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)
    73. 

  73. -
    74. 

  74. -ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL i686
    75. 

  75. -	OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
    76. 

  76. -    SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
    77. 

  77. -
    78. 

  78. -ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    79. 

  79. +ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    80. 

  80.      MESSAGE(FATAL_ERROR
    81. 

  81.              "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")
    82. 

  82. -ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
    83. 

  83. +ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
    84. 

  84.  
    85. 

  85.  SET(MODULE_FILE
    86. 

  86.      ${MODULE_NAME}.ko
    87. 

  87. -- 
    88. 

  88. 1.9.3
    89. 

  89.