[emos] 32/37: Fix sonames

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository emos.

commit 836a54f74ea5203a5c96b9e27a10e9c0ba5e4120
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jun 21 20:54:20 2015 +0100

    Fix sonames
---
 debian/patches/shared.patch | 60 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index f37d532..4e28549 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,14 +4,14 @@ Description: Enable building shared libs in emoslib (cmake)
  but a cleaner patch than before.
  Needs to build -fpic, -mcmodel=medium for shared, but preferably don't
  for static, so build in separate dirs.
-Last-Update: 2015-05-25
+Last-Update: 2015-06-14
 Forwarded: no
 
 Index: emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
 ===================================================================
 --- /dev/null
 +++ emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
 +foreach( _src ${libemos_srcs} )
 +  list( APPEND emos_sp_shared_srcs ../${_src} )
 +endforeach()
@@ -27,6 +27,7 @@ Index: emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
 +ecbuild_add_library(
 +  TYPE SHARED
 +  TARGET      emos_sp_shared
++  VERSION     0d
 +  OUTPUT_NAME "emos"
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
 +  SOURCES     ../libemos_version.c ${emos_sp_shared_srcs}
@@ -53,7 +54,7 @@ Index: emoslib-4.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
 +ecbuild_add_library(
 +  TYPE SHARED
 +  TARGET      emos_shared
-+  VERSION     libemosR64.so.0d
++  VERSION     0d
 +  OUTPUT_NAME "emosR64"
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
 +  SOURCES     ../libemos_version.c ${emos_dp_shared_srcs}
@@ -76,6 +77,15 @@ Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
 ===================================================================
 --- emoslib-4.0.3+dfsg.1.orig/cmake/ecbuild_add_library.cmake
 +++ emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
+@@ -13,7 +13,7 @@
+ function( ecbuild_add_library_impl )
+ 
+ 	set( options NOINSTALL AUTO_VERSION )
+-	set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
++	set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION SONAME SOVERSION OUTPUT_NAME )
+ 	set( multi_value_args  SOURCES TEMPLATES LIBS INCLUDES DEPENDS PERSISTENT DEFINITIONS CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
+ 
+ 	cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}"  ${_FIRST_ARG} ${ARGN} )
 @@ -119,6 +119,15 @@ function( ecbuild_add_library_impl )
  
  		get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
@@ -92,3 +102,47 @@ Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
  			if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
  				set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
  			endif()
+@@ -130,6 +139,13 @@ function( ecbuild_add_library_impl )
+ 			endif()
+ 		endif()
+ 
++                if (DEFINED _PAR_SOVERSION )
++                        set_target_properties( ${_PAR_TARGET} PROPERTIES SOVERSION "${_PAR_SOVERSION}" )
++                endif()
++                if (DEFINED _PAR_SONAME )
++                        set_target_properties( ${_PAR_TARGET} PROPERTIES SONAME "${_PAR_SONAME}" )
++                endif()
++
+ 		# define VERSION if requested
+ 		if( DEFINED _PAR_VERSION )
+ 			set_target_properties( ${_PAR_TARGET} PROPERTIES VERSION "${_PAR_VERSION}" )
+Index: emoslib-4.0.3+dfsg.1/libemos-dp/CMakeLists.txt
+===================================================================
+--- emoslib-4.0.3+dfsg.1.orig/libemos-dp/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/libemos-dp/CMakeLists.txt
+@@ -20,10 +20,5 @@ ecbuild_add_library(
+   SOURCES     ../libemos_version.c ${emos_dp_srcs}
+   GENERATED   ../libemos_version.c )
+ 
+-#if( BUILD_SHARED_LIBS )
+-#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-#              libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
+-#else()
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+               libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
+-#endif()
+Index: emoslib-4.0.3+dfsg.1/libemos-sp/CMakeLists.txt
+===================================================================
+--- emoslib-4.0.3+dfsg.1.orig/libemos-sp/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/libemos-sp/CMakeLists.txt
+@@ -25,10 +25,5 @@ ecbuild_add_library(
+   SOURCES     ../libemos_version.c ${emos_sp_srcs}
+   GENERATED   ../libemos_version.c )
+ 
+-#if( BUILD_SHARED_LIBS )
+-#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-#             libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
+-#else()
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+              libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
+-#endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git