package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch

   1 From ded9f83ef3bcb4c688da80354c179543e4862e52 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
   6 Using '.' to install the stack libraries is not correct since
   7 it will install them to /usr/.
   8
   9 ls /usr/liboplkmnapp-kernelintf.so
  10
  11 Fix this by using 'lib' instead of '.'
  12
  13 The problem with the openpowerlink build system is that it expect
  14 the stack directory to be a "local staging" directory which
  15 contains headers and libraries. So the libraries build by the
  16 stack project are installed in stack/lib by default.
  17
  18 This is wrong to do that because it becomes difficult to package
  19 openpowerlink for normal Linux systems.
  20
  21 Buildroot like others build system expect from a packaged software
  22 to install libraries and headers build/provided in a staging
  23 directory.
  24
  25 It seems that CMAKE_INSTALL_PREFIX is misused by the default value
  26 "${CMAKE_CURRENT_SOURCE_DIR}/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}"
  27 since it already contains the lib directory and therefore the
  28 entire build system is messed up.
  29
  30 It seems that the openpowerlink's build system doesn't allow/support
  31 CMAKE_INSTALL_PREFIX to be set externally
  32 (which is the standard approach).
  33
  34 The issue has been reported [1] upstream and a build system
  35 refactoring is needed to fix this properly.
  36
  37 [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c
  38
  39 Signed-off-by: Romain Naour <romain.naour@gmail.com>
  40 ---
  41  stack/proj/linux/liboplkcn/CMakeLists.txt               | 2 +-
  42  stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +-
  43  stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt   | 2 +-
  44  stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt       | 2 +-
  45  stack/proj/linux/liboplkmn/CMakeLists.txt               | 2 +-
  46  stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +-
  47  stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt | 2 +-
  48  stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt   | 2 +-
  49  stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt       | 2 +-
  50  9 files changed, 9 insertions(+), 9 deletions(-)
  51
  52 diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt
  53 index c700d9d..b891553 100644
  54 --- a/stack/proj/linux/liboplkcn/CMakeLists.txt
  55 +++ b/stack/proj/linux/liboplkcn/CMakeLists.txt
  56 @@ -94,4 +94,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  57  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  58  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  59  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  60 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  61 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  62 diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  63 index 03752df..7b1050c 100644
  64 --- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  65 +++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
  66 @@ -87,4 +87,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  67  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  68  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  69  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  70 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  71 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  72 diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  73 index bcc4273..8ca5b7e 100644
  74 --- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  75 +++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
  76 @@ -87,4 +87,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  77  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  78  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  79  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  80 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  81 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  82 diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  83 index 440f02c..6ffcbe9 100644
  84 --- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  85 +++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
  86 @@ -77,4 +77,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  87  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  88  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  89  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
  90 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
  91 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
  92 diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt
  93 index a8850b8..d762d4c 100644
  94 --- a/stack/proj/linux/liboplkmn/CMakeLists.txt
  95 +++ b/stack/proj/linux/liboplkmn/CMakeLists.txt
  96 @@ -93,4 +93,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
  97  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
  98  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  99  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
 100 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 101 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 102 diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
 103 index f2606a3..f71b182 100644
 104 --- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
 105 +++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
 106 @@ -86,4 +86,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
 107  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
 108  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
 109  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
 110 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 111 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 112 diff --git a/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt
 113 index 9362ad8..1d5fb6d 100644
 114 --- a/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt
 115 +++ b/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt
 116 @@ -88,4 +88,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
 117  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
 118  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
 119  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
 120 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 121 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 122 diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
 123 index 6741eef..042cbcf 100644
 124 --- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
 125 +++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
 126 @@ -86,4 +86,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
 127  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
 128  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
 129  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
 130 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 131 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 132 diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
 133 index b4dd41b..cf875ca 100644
 134 --- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
 135 +++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
 136 @@ -80,4 +80,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
 137  TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
 138  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
 139  SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
 140 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 141 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 142 --
 143 2.5.5
 144