[emos] 28/37: WIP: Test adding SOVERSION to shared lib

[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 0e5941f9a1b6865dd10af35b22893207e772e7e4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed May 27 16:23:38 2015 +0100

    WIP: Test adding SOVERSION to shared lib
---
 debian/patches/shared.patch | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index ad36184..f37d532 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -7,18 +7,13 @@ Description: Enable building shared libs in emoslib (cmake)
 Last-Update: 2015-05-25
 Forwarded: no
 
-Index: emoslib-000403+dfsg.1/libemos-sp-shared/CMakeLists.txt
+Index: emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/libemos-sp-shared/CMakeLists.txt
-@@ -0,0 +1,24 @@
++++ emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
+@@ -0,0 +1,19 @@
 +foreach( _src ${libemos_srcs} )
-+  add_custom_command(
-+    OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${_src}
-+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LIBEMOS_BASE_DIR}/${_src} ${CMAKE_CURRENT_BINARY_DIR}/${_src}
-+    COMMENT "copying ${_src} from emos (sp)"
-+    DEPENDS ${LIBEMOS_BASE_DIR}/${_src} )
-+  list( APPEND emos_sp_shared_srcs ${CMAKE_CURRENT_BINARY_DIR}/${_src} )
++  list( APPEND emos_sp_shared_srcs ../${_src} )
 +endforeach()
 +
 +# excluding double-precision specific definitions
@@ -36,14 +31,11 @@ Index: emoslib-000403+dfsg.1/libemos-sp-shared/CMakeLists.txt
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
 +  SOURCES     ../libemos_version.c ${emos_sp_shared_srcs}
 +  GENERATED   ../libemos_version.c )
-+
-+#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-+#             libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
-Index: emoslib-000403+dfsg.1/libemos-dp-shared/CMakeLists.txt
+Index: emoslib-4.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/libemos-dp-shared/CMakeLists.txt
-@@ -0,0 +1,24 @@
++++ emoslib-4.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
+@@ -0,0 +1,23 @@
 +# configure Fortran-based targets for double precision (compilation & linking)
 +
 +set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${emos_double_precision_flags}")
@@ -51,7 +43,7 @@ Index: emoslib-000403+dfsg.1/libemos-dp-shared/CMakeLists.txt
 +# library
 +
 +foreach( _src ${libemos_srcs} )
-+  list( APPEND emos_dp_srcs ../${_src} )
++  list( APPEND emos_dp_shared_srcs ../${_src} )
 +endforeach()
 +
 +set( CMAKE_Fortran_MODULE_DIRECTORY  ${CMAKE_CURRENT_BINARY_DIR} )
@@ -61,18 +53,17 @@ Index: emoslib-000403+dfsg.1/libemos-dp-shared/CMakeLists.txt
 +ecbuild_add_library(
 +  TYPE SHARED
 +  TARGET      emos_shared
++  VERSION     libemosR64.so.0d
 +  OUTPUT_NAME "emosR64"
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
 +  SOURCES     ../libemos_version.c ${emos_dp_shared_srcs}
 +  GENERATED   ../libemos_version.c )
 +
-+#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-+#              libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
-Index: emoslib-000403+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
 ===================================================================
---- emoslib-000403+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-000403+dfsg.1/CMakeLists.txt
-@@ -235,6 +235,8 @@ if( HAVE_SINGLE_PRECISION)
+--- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
+@@ -242,6 +242,8 @@ if( HAVE_SINGLE_PRECISION)
    add_subdirectory( libemos-sp )
  endif()
  add_subdirectory( libemos-dp )
@@ -81,11 +72,10 @@ Index: emoslib-000403+dfsg.1/CMakeLists.txt
  
  ecbuild_add_executable(
    TARGET      libemos_version
- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-Index: emoslib-000403+dfsg.1/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
 ===================================================================
---- emoslib-000403+dfsg.1.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-000403+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
 @@ -119,6 +119,15 @@ function( ecbuild_add_library_impl )
  
  		get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )

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