cirros-testvm/src-cirros/buildroot-2015.05/package/openpowerlink/0002-fix-user-space-stack-enable-shared-build.patch

   1 From 9c11eef037dc1137ab7a4656e45afde7d1a615c4 Mon Sep 17 00:00:00 2001
   2 From: Romain Naour <romain.naour@openwide.fr>
   3 Date: Sat, 22 Nov 2014 16:38:01 +0100
   4 Subject: [PATCH 2/2] [FIX]: user space stack: enable dynamic build
   5
   6 The build fail if BUILD_SHARED_LIBS is set to ON.
   7
   8 Depending on BUILD_SHARED_LIBS, link with STATIC or SHARED.
   9
  10 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
  11 ---
  12  Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt | 12 +++++++++---
  13  1 file changed, 9 insertions(+), 3 deletions(-)
  14
  15 diff --git a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
  16 index 40b7756..27360f2 100644
  17 --- a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
  18 +++ b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
  19 @@ -93,7 +93,13 @@ ENDIF(CFG_STORE_RESTORE)
  20  #
  21  # Set type of library
  22  #
  23 -IF (WIN32)
  24 +IF (UNIX)
  25 +    IF (BUILD_SHARED_LIBS)
  26 +        SET(LIB_TYPE "SHARED")
  27 +    ELSE (BUILD_SHARED_LIBS)
  28 +        SET(LIB_TYPE "STATIC")
  29 +    ENDIF(BUILD_SHARED_LIBS)
  30 +ELSEIF (WIN32)
  31      IF(CFG_X86_WINDOWS_DLL)
  32          SET(LIB_TYPE "SHARED")
  33      ELSE(CFG_X86_WINDOWS_DLL)
  34 @@ -313,7 +319,7 @@ ENDIF ()
  35  # Define library source code
  36  #
  37  IF (UNIX)
  38 -    ADD_LIBRARY(powerlink ${LIB_SOURCES} ${LIB_SOURCES_KERNEL} ${LIB_SOURCES_USER} ${LIB_HEADERS} ${LIB_HEADERS_KERNEL} ${LIB_HEADERS_USER} ${LIB_OBJDICT})
  39 +    ADD_LIBRARY(powerlink ${LIB_TYPE} ${LIB_SOURCES} ${LIB_SOURCES_KERNEL} ${LIB_SOURCES_USER} ${LIB_HEADERS} ${LIB_HEADERS_KERNEL} ${LIB_HEADERS_USER} ${LIB_OBJDICT})
  40
  41      SET_PROPERTY(TARGET powerlink
  42                   PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
  43 @@ -330,7 +336,7 @@ ENDIF ()
  44  # Installation
  45  #
  46  IF (UNIX)
  47 -    INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib)
  48 +    INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT library)
  49  ELSEIF (WIN32)
  50      IF (CFG_X86_WINDOWS_DLL)
  51          INSTALL(TARGETS openPOWERLINK RUNTIME DESTINATION bin)
  52 --
  53 1.9.3
  54