packaging/0001-build-sys-fixes-to-get-built-fixes-for-64-bit-distro.patch

   1 From 5ecf7794e6635a331b57740b5d4491bba0a12a42 Mon Sep 17 00:00:00 2001
   2 From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
   3 Date: Wed, 6 Jun 2012 17:41:55 +0300
   4 Subject: [PATCH 1/8] build-sys: fixes to get built, fixes for 64-bit distros.
   5
   6 ---
   7  CMakeLists.txt                             |   23 +++++++++++++++++++----
   8  PluginCommandInterfaceDbus/CMakeLists.txt  |    4 ++--
   9  PluginControlInterface/CMakeLists.txt      |    2 +-
  10  PluginRoutingInterfaceAsync/CMakeLists.txt |    2 +-
  11  PluginRoutingInterfaceDbus/CMakeLists.txt  |    2 +-
  12  audiomanager.pc.cmake                      |   12 ++++++++++++
  13  cmake/FindDBUS.cmake                       |    6 +++---
  14  7 files changed, 39 insertions(+), 12 deletions(-)
  15  create mode 100644 audiomanager.pc.cmake
  16
  17 diff --git a/CMakeLists.txt b/CMakeLists.txt
  18 index 7d63451..f06c238 100644
  19 --- a/CMakeLists.txt
  20 +++ b/CMakeLists.txt
  21 @@ -29,6 +29,10 @@ ELSE (NOT DAEMONVERSION)
  22      STRING(REGEX REPLACE "-" "." DAEMONVERSION ${DAEMONVERSION})
  23  ENDIF(NOT DAEMONVERSION)
  24
  25 +IF(NOT DEFINED LIBDIR)
  26 +       SET(LIBDIR lib)
  27 +ENDIF(NOT DEFINED LIBDIR)
  28 +
  29  message(STATUS "Build Version ${DAEMONVERSION}")
  30
  31  execute_process(COMMAND git log --pretty=short WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  32 @@ -99,11 +103,16 @@ if(USE_BUILD_LIBS)
  33         SET(DEFAULT_PLUGIN_ROUTING_DIR "${PLUGINS_OUTPUT_PATH}/routing")
  34         SET(CONTROLLER_PLUGIN "${PLUGINS_OUTPUT_PATH}/control/libPluginControlInterface.so")
  35  else(USE_BUILD_LIBS)
  36 -       SET(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command")
  37 -       SET(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing")
  38 -       SET(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so")
  39 +       SET(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${LIB_INSTALL_SUFFIX}/command")
  40 +       SET(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${LIB_INSTALL_SUFFIX}/routing")
  41 +       SET(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so")
  42  endif(USE_BUILD_LIBS)
  43
  44 +message(STATUS "default directory for command plugin ${DEFAULT_PLUGIN_COMMAND_DIR}")
  45 +message(STATUS "                      routing plugin ${DEFAULT_PLUGIN_ROUTING_DIR}")
  46 +message(STATUS "default controller plugin ${CONTROLLER_PLUGIN}")
  47 +
  48 +
  49  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
  50  SET(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include)
  51  SET(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/doc)
  52 @@ -118,10 +127,12 @@ endif(EXISTS "ProjectSpecific/")
  53
  54  CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/include/config.h )
  55  CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/docx/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile )
  56 -
  57 +CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/audiomanager.pc.cmake ${CMAKE_SOURCE_DIR}/audiomanager.pc @ONLY)
  58
  59  IF(WITH_DLT)
  60      pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0)
  61 +ELSE(WITH_DLT)
  62 +    set(CMAKE_EXE_LINKER_FLAGS "-lrt")
  63  ENDIF(WITH_DLT)
  64
  65
  66 @@ -159,6 +170,10 @@ IF(EXISTS "ProjectSpecific/")
  67      add_subdirectory (ProjectSpecific)
  68  endif(EXISTS "ProjectSpecific/")
  69
  70 +INSTALL(FILES audiomanager.pc
  71 +        DESTINATION ${LIBDIR}/pkgconfig
  72 +       COMPONENT devel)
  73 +
  74  # uninstall target
  75  configure_file(
  76      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
  77 diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt
  78 index 9d7f8a7..90e7574 100644
  79 --- a/PluginCommandInterfaceDbus/CMakeLists.txt
  80 +++ b/PluginCommandInterfaceDbus/CMakeLists.txt
  81 @@ -68,12 +68,12 @@ ENDIF(WITH_TESTS)
  82  #ENDIF(WITH_DOCUMENTATION)
  83
  84  INSTALL(TARGETS PluginCommandInterfaceDbus
  85 -        DESTINATION "lib/${LIB_INSTALL_SUFFIX}/command"
  86 +        DESTINATION "${LIBDIR}/${LIB_INSTALL_SUFFIX}/command"
  87          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
  88          COMPONENT sampleplugins
  89  )
  90
  91 -execute_process(COMMAND cp "${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${INCLUDE_FOLDER}/CommandInterface.xml" ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml)
  92 +execute_process(COMMAND /bin/sh -c "mkdir -p ${EXECUTABLE_OUTPUT_PATH}; cp ${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${include_FOLDER}/CommandInterface.xml ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml")
  93
  94  SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)")
  95  set_property(GLOBAL APPEND PROPERTY sampleplugins_prop "${ADD_DEPEND}")
  96 diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
  97 index b1be2d1..60e2b8b 100644
  98 --- a/PluginControlInterface/CMakeLists.txt
  99 +++ b/PluginControlInterface/CMakeLists.txt
 100 @@ -62,7 +62,7 @@ ENDIF(WITH_TESTS)
 101  #ENDIF(WITH_DOCUMENTATION)
 102
 103  INSTALL(TARGETS PluginControlInterface
 104 -        DESTINATION "lib/${LIB_INSTALL_SUFFIX}/control"
 105 +        DESTINATION "${LIBDIR}/${LIB_INSTALL_SUFFIX}/control"
 106          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 107          COMPONENT sampleplugins
 108  )
 109 diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt
 110 index e3e52f7..e68f9ea 100644
 111 --- a/PluginRoutingInterfaceAsync/CMakeLists.txt
 112 +++ b/PluginRoutingInterfaceAsync/CMakeLists.txt
 113 @@ -70,7 +70,7 @@ ENDIF(WITH_TESTS)
 114
 115
 116  INSTALL(TARGETS PluginRoutingInterfaceAsync
 117 -        DESTINATION "lib/${LIB_INSTALL_SUFFIX}/routing"
 118 +        DESTINATION "${LIBDIR}/${LIB_INSTALL_SUFFIX}/routing"
 119          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 120          COMPONENT sampleplugins
 121  )
 122 diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt
 123 index 4f8ade9..3050db6 100644
 124 --- a/PluginRoutingInterfaceDbus/CMakeLists.txt
 125 +++ b/PluginRoutingInterfaceDbus/CMakeLists.txt
 126 @@ -71,7 +71,7 @@ execute_process(COMMAND cp "${CMAKE_SOURCE_DIR}/PluginRoutingInterfaceDbus/${INC
 127  #ENDIF(WITH_DOCUMENTATION)
 128
 129  INSTALL(TARGETS PluginRoutingInterfaceDbus
 130 -        DESTINATION "lib/${LIB_INSTALL_SUFFIX}/routing"
 131 +        DESTINATION "${LIBDIR}/${LIB_INSTALL_SUFFIX}/routing"
 132          PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 133          COMPONENT sampleplugins
 134  )
 135 diff --git a/audiomanager.pc.cmake b/audiomanager.pc.cmake
 136 new file mode 100644
 137 index 0000000..d83f00b
 138 --- /dev/null
 139 +++ b/audiomanager.pc.cmake
 140 @@ -0,0 +1,12 @@
 141 +prefix=@prefix@
 142 +exec_prefix=@prefix@
 143 +libdir=@libdir@
 144 +includedir=@includedir@
 145 +
 146 +Name: audiomanager
 147 +Description: GENIVI Audio Manager
 148 +Version: @GENIVI_PROJECT_VERSION@
 149 +Requires:
 150 +Libs: -L${libdir} -ldlt -lrt -lpthread
 151 +Cflags: -I${includedir}/dlt -DDLT_@PRINT_MAJOR_VERSION@_@PRINT_MINOR_VERSION@
 152 +
 153 diff --git a/cmake/FindDBUS.cmake b/cmake/FindDBUS.cmake
 154 index 0935b2f..2d2cd9e 100644
 155 --- a/cmake/FindDBUS.cmake
 156 +++ b/cmake/FindDBUS.cmake
 157 @@ -22,13 +22,13 @@ FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
 158  )
 159
 160  FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
 161 -/usr/lib/dbus-1.0/include
 162 -/usr/lib/*/dbus-1.0/include
 163 +/usr/${LIBDIR}/dbus-1.0/include
 164 +/usr/${LIBDIR}/*/dbus-1.0/include
 165  )
 166
 167  FIND_LIBRARY(DBUS_LIBRARY
 168  NAMES dbus-1
 169 -PATHS /lib
 170 +PATHS /${LIBDIR}
 171  )
 172
 173  SET( DBUS_FOUND "NO" )
 174 --
 175 1.7.7.6
 176