[open-coarrays] 75/80: shared_patch merged upstream

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit c698e543ed034aaa3d8fbd6b8eb2b6385cce6c80
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Sep 23 12:36:06 2017 +0100

    shared_patch merged upstream
---
 debian/changelog            |  1 +
 debian/patches/series       |  1 -
 debian/patches/shared.patch | 35 -----------------------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50d56bd..d70d621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 open-coarrays (1.9.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  - shared_patch merged upstream
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 23 Sep 2017 12:33:10 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1001d4f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-shared.patch
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
deleted file mode 100644
index 82d99e4..0000000
--- a/debian/patches/shared.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Add shared, static versions of libraries
-Forwarded: no
-Last-Updated: 2016-11-04
- TODO: Make this work without _static 
-
-Index: open-coarrays-1.8.6/src/mpi/CMakeLists.txt
-===================================================================
---- open-coarrays-1.8.6.orig/src/mpi/CMakeLists.txt
-+++ open-coarrays-1.8.6/src/mpi/CMakeLists.txt
-@@ -36,7 +36,8 @@ if (MPI_Fortran_MODULE_COMPILES)
-   set(MPI_CAF_FORTRAN_FILES ../extensions/opencoarrays.F90)
- endif()
- 
--add_library(caf_mpi mpi_caf.c ../common/caf_auxiliary.c ${MPI_CAF_FORTRAN_FILES})
-+add_library(caf_mpi SHARED mpi_caf.c ../common/caf_auxiliary.c ${MPI_CAF_FORTRAN_FILES})
-+add_library(caf_mpi_static STATIC  mpi_caf.c ../common/caf_auxiliary.c ${MPI_CAF_FORTRAN_FILES})
- target_link_libraries(caf_mpi PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES})
- 
- set_target_properties ( caf_mpi
-@@ -53,9 +54,14 @@ endif()
- include_directories(${CMAKE_BINARY_DIR}/mod)
- 
- install(TARGETS caf_mpi EXPORT OpenCoarraysTargets
-+  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+)
-+install(TARGETS caf_mpi_static EXPORT OpenCoarraysTargets
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- )
-+set_target_properties(caf_mpi PROPERTIES SOVERSION 1 SONAME "libcaf_mpi.so.${OpenCoarraysVersion}")
- 
- # Install modules to standard include dir, but namespace them with compiler/version
- set (mod_install "OpenCoarrays/${CMAKE_Fortran_COMPILER_ID}/${CMAKE_Fortran_COMPILER_VERSION}")

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