0001-install-the-stack-libraries-to-lib-subdirectory.patch 9.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167
  1. From 16230b7f51bff2bdf061fa80e9a49c807596bb92 Mon Sep 17 00:00:00 2001
  2. From: Romain Naour <romain.naour@gmail.com>
  3. Date: Wed, 25 May 2016 15:57:10 +0200
  4. Subject: [PATCH] install the stack libraries to "lib" subdirectory
  5. Using '.' to install the stack libraries is not correct since
  6. it will install them to /usr/.
  7. ls /usr/liboplkmnapp-kernelintf.so
  8. Fix this by using 'lib' instead of '.'
  9. The problem with the openpowerlink build system is that it expect
  10. the stack directory to be a "local staging" directory which
  11. contains headers and libraries. So the libraries build by the
  12. stack project are installed in stack/lib by default.
  13. This is wrong to do that because it becomes difficult to package
  14. openpowerlink for normal Linux systems.
  15. Buildroot like others build system expect from a packaged software
  16. to install libraries and headers build/provided in a staging
  17. directory.
  18. It seems that CMAKE_INSTALL_PREFIX is misused by the default value
  19. "${CMAKE_CURRENT_SOURCE_DIR}/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}"
  20. since it already contains the lib directory and therefore the
  21. entire build system is messed up.
  22. It seems that the openpowerlink's build system doesn't allow/support
  23. CMAKE_INSTALL_PREFIX to be set externally
  24. (which is the standard approach).
  25. The issue has been reported [1] upstream and a build system
  26. refactoring is needed to fix this properly.
  27. [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c
  28. [rebase on v2.5.0]
  29. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  30. ---
  31. stack/proj/linux/liboplkcn-sim/CMakeLists.txt | 2 +-
  32. stack/proj/linux/liboplkcn/CMakeLists.txt | 2 +-
  33. stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +-
  34. stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt | 2 +-
  35. stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt | 2 +-
  36. stack/proj/linux/liboplkmn-sim/CMakeLists.txt | 2 +-
  37. stack/proj/linux/liboplkmn/CMakeLists.txt | 2 +-
  38. stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +-
  39. stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt | 2 +-
  40. stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt | 2 +-
  41. stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt | 2 +-
  42. 11 files changed, 11 insertions(+), 11 deletions(-)
  43. diff --git a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
  44. index 2b3da16..ddb3e92 100644
  45. --- a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
  46. +++ b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
  47. @@ -96,4 +96,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  48. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  49. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  50. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  51. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  52. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  53. diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt
  54. index 3be6c52..cf1b1dd 100644
  55. --- a/stack/proj/linux/liboplkcn/CMakeLists.txt
  56. +++ b/stack/proj/linux/liboplkcn/CMakeLists.txt
  57. @@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  58. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  59. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  60. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  61. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  62. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  63. diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  64. index 904de6c..d8713a8 100644
  65. --- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  66. +++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  67. @@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  68. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  69. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  70. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  71. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  72. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  73. diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  74. index e2514cf..a4e2b75 100644
  75. --- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  76. +++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  77. @@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  78. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  79. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  80. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  81. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  82. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  83. diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  84. index 98f068c..bb20006 100644
  85. --- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  86. +++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  87. @@ -76,4 +76,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  88. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  89. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  90. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  91. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  92. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  93. diff --git a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt
  94. index eb6396a..5beaa07 100644
  95. --- a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt
  96. +++ b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt
  97. @@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  98. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  99. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  100. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  101. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  102. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  103. diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt
  104. index cf7927f..6b19557 100644
  105. --- a/stack/proj/linux/liboplkmn/CMakeLists.txt
  106. +++ b/stack/proj/linux/liboplkmn/CMakeLists.txt
  107. @@ -89,4 +89,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  108. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  109. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  110. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  111. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  112. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  113. diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
  114. index 9daa2df..bfccb25 100644
  115. --- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
  116. +++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
  117. @@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  118. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  119. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  120. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  121. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  122. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  123. diff --git a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt
  124. index 0135f46..83128eb 100644
  125. --- a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt
  126. +++ b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt
  127. @@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  128. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  129. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  130. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  131. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  132. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  133. diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
  134. index cd97882..aaaa526 100644
  135. --- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
  136. +++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
  137. @@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  138. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  139. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  140. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  141. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  142. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  143. diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
  144. index 0c29087..1783134 100644
  145. --- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
  146. +++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
  147. @@ -79,4 +79,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  148. TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  149. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  150. SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  151. -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  152. +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  153. --
  154. 2.9.4