[open-coarrays] 54/80: re-enable shared patch

[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 637ccd4a72c616f63c4a51d70968dea1c6c86c82
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 20 12:34:54 2017 +0100

    re-enable shared patch
---
 debian/patches/series       |  1 +
 debian/patches/shared.patch | 76 ++++++++++++++++++++-------------------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1001d4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+shared.patch
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 89d711c..061341b 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,65 +4,55 @@ Forwarded: no
 Last-Updated: 2016-11-04
  TODO: Make this work without _static 
 
-Index: open-coarrays-1.7.4/src/mpi/CMakeLists.txt
+Index: open-coarrays-1.8.6/src/mpi/CMakeLists.txt
 ===================================================================
---- open-coarrays-1.7.4.orig/src/mpi/CMakeLists.txt
-+++ open-coarrays-1.7.4/src/mpi/CMakeLists.txt
-@@ -15,7 +15,8 @@ if(gfortran_compiler AND (NOT opencoarra
-   add_definitions(-DCOMPILER_SUPPORTS_CAF_INTRINSICS)
+--- 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 ../extensions/opencoarrays.F90)
-+add_library(caf_mpi SHARED  mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)
-+add_library(caf_mpi_static STATIC  mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)
- 
- target_include_directories(caf_mpi PRIVATE ${MPI_C_INCLUDE_PATH})
- if (gfortran_compiler)
-@@ -24,9 +25,14 @@ 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
+ install(TARGETS caf_mpi EXPORT OpenCoarraysTargets
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++)
 +install(TARGETS caf_mpi_static EXPORT OpenCoarraysTargets
-   ARCHIVE DESTINATION lib
--)
-+  )
-+install(TARGETS caf_mpi EXPORT OpenCoarraysTargets 
-+  DESTINATION lib
-+  )
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ )
 +set_target_properties(caf_mpi PROPERTIES SOVERSION 0d SONAME 'libcaf_mpi.so.0d')
-+
- install(DIRECTORY  ${CMAKE_BINARY_DIR}/mod DESTINATION .)
- 
- # Now we write the script that passes CAF source to the compiler with the necessary arguments
-@@ -79,6 +85,6 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/..
- file(APPEND "${caf_launcher}" "${FOOTER}")
- 
- # This could be needed to produce shared libraries:
--#target_link_libraries(caf_mpi PRIVATE ${MPI_C_LIBRARIES})
-+target_link_libraries(caf_mpi PRIVATE ${MPI_C_LIBRARIES} ${MPI_F_LIBRARIES})
  
- #set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${exe_dir}/cafrun;${exe_dir}/caf;${exe_dir}/test-caf-tally.sh")
-Index: open-coarrays-1.7.4/src/single/CMakeLists.txt
+ # Install modules to standard include dir, but namespace them with compiler/version
+ set (mod_install "OpenCoarrays/${CMAKE_Fortran_COMPILER_ID}/${CMAKE_Fortran_COMPILER_VERSION}")
+Index: open-coarrays-1.8.6/src/single/CMakeLists.txt
 ===================================================================
---- open-coarrays-1.7.4.orig/src/single/CMakeLists.txt
-+++ open-coarrays-1.7.4/src/single/CMakeLists.txt
-@@ -1,5 +1,8 @@
+--- open-coarrays-1.8.6.orig/src/single/CMakeLists.txt
++++ open-coarrays-1.8.6/src/single/CMakeLists.txt
+@@ -1,5 +1,10 @@
 -add_library(caf_single single.c ../common/caf_auxiliary.c)
--target_compile_options(caf_single INTERFACE -fcoarray=lib)
--install(TARGETS caf_single EXPORT OpenCoarraysTargets
 +add_library(caf_single SHARED single.c ../common/caf_auxiliary.c)
-+add_library(caf_single_static single.c ../common/caf_auxiliary.c)
-+target_compile_options(caf_single_static INTERFACE -fcoarray=lib)
++add_library(caf_single_static  single.c ../common/caf_auxiliary.c)
+ target_compile_options(caf_single INTERFACE -fcoarray=lib)
+ install(TARGETS caf_single EXPORT OpenCoarraysTargets
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++)
 +install(TARGETS caf_single_static EXPORT OpenCoarraysTargets
-   ARCHIVE DESTINATION lib
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
  )
-+install(TARGETS caf_single EXPORT OpenCoarraysTargets DESTINATION lib)
 +set_target_properties(caf_single PROPERTIES SOVERSION 0d SONAME 'libcaf_single.so.0d')
-Index: open-coarrays-1.7.4/src/CMakeLists.txt
+Index: open-coarrays-1.8.6/src/CMakeLists.txt
 ===================================================================
---- open-coarrays-1.7.4.orig/src/CMakeLists.txt
-+++ open-coarrays-1.7.4/src/CMakeLists.txt
+--- open-coarrays-1.8.6.orig/src/CMakeLists.txt
++++ open-coarrays-1.8.6/src/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -set(directories_to_build mpi tests)
 +set(directories_to_build mpi single tests)

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