[emos] 10/11: Updated shared.patch. SONAME, SOVERSIO no longer needed

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jul 21 15:41:06 UTC 2017


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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit 948f61fa447012adcf44ba07082db20f68947261
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 4 14:21:12 2017 +0100

    Updated shared.patch. SONAME,SOVERSIO no longer needed
---
 debian/changelog            |  1 +
 debian/patches/shared.patch | 40 +---------------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14f68f2..6fa1c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 emoslib (2:4.4.9-1) UNRELEASED; urgency=medium
 
   * New upstream release
+    - Updated shared.patch. SONAME,SOVERSIO no longer needed
   * Standards-Version: 4.0.0
   * Add watch file
 
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 8b7bd8a..fd44213 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,7 +4,7 @@ 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: 2016-11-28
+Last-Update: 2017-07-04
 Forwarded: no
 
 Index: emoslib-4.4.9/libemos-sp-shared/CMakeLists.txt
@@ -95,41 +95,3 @@ Index: emoslib-4.4.9/cmake/ecbuild_add_library.cmake
        if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
          set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
        endif()
-@@ -370,6 +379,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 )
-       ecbuild_debug("ecbuild_add_library(${_PAR_TARGET}): set build version to ${_PAR_VERSION}")
-Index: emoslib-4.4.9/libemos-dp/CMakeLists.txt
-===================================================================
---- emoslib-4.4.9.orig/libemos-dp/CMakeLists.txt
-+++ emoslib-4.4.9/libemos-dp/CMakeLists.txt
-@@ -29,6 +29,7 @@ ecbuild_add_library(
-   TYPE        STATIC
-   TARGET      emos
-   OUTPUT_NAME "emosR64"
-+  SONAME      "libemosR64.so.0d"
-   DEFINITIONS ${LIBEMOS_DEFINITIONS} ${emos_interpol_tables_def}
-   LIBS        "${GRIB_API_LIBRARIES}" "${FFTW_LIB}" ${FORTRAN_LIBRARIES}
-   SOURCES     ../libemos_version.c ${emos_dp_srcs}
-Index: emoslib-4.4.9/libemos-sp/CMakeLists.txt
-===================================================================
---- emoslib-4.4.9.orig/libemos-sp/CMakeLists.txt
-+++ emoslib-4.4.9/libemos-sp/CMakeLists.txt
-@@ -34,6 +34,7 @@ ecbuild_add_library(
-   TYPE        STATIC
-   TARGET      emos_sp
-   OUTPUT_NAME "emos"
-+  SONAME      "libemos.so.0d"
-   DEFINITIONS ${LIBEMOS_DEFINITIONS} ${emos_interpol_tables_def}
-   LIBS        "${GRIB_API_LIBRARIES}" "${FFTW_LIB}" "${FORTRAN_LIBRARIES}"
-   SOURCES     ../libemos_version.c ${emos_sp_srcs}

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



More information about the debian-science-commits mailing list