[open-coarrays] 24/80: Update shared patch; reinclude single

[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 c1e0cc3d6f319bac77f2c00525063a98b7886469
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 27 01:31:51 2016 +0100

    Update shared patch; reinclude single
---
 debian/patches/shared.patch | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index d9c729c..54a9ca6 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,10 +4,10 @@ Forwarded: no
 Last-Updated: 2016-06-03
  TODO: Make this work without _static 
 
-Index: open-coarrays-1.6.0/src/mpi/CMakeLists.txt
+Index: OpenCoarrays.git/src/mpi/CMakeLists.txt
 ===================================================================
---- open-coarrays-1.6.0.orig/src/mpi/CMakeLists.txt
-+++ open-coarrays-1.6.0/src/mpi/CMakeLists.txt
+--- OpenCoarrays.git.orig/src/mpi/CMakeLists.txt
++++ OpenCoarrays.git/src/mpi/CMakeLists.txt
 @@ -15,7 +15,8 @@ if(gfortran_compiler AND (NOT opencoarra
    add_definitions(-DCOMPILER_SUPPORTS_CAF_INTRINSICS)
  endif()
@@ -35,7 +35,7 @@ Index: open-coarrays-1.6.0/src/mpi/CMakeLists.txt
  install(DIRECTORY  ${CMAKE_BINARY_DIR}/mod DESTINATION .)
  
  # Now we write the script that passes CAF source to the compiler with the necessary arguments
-@@ -74,6 +80,6 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/..
+@@ -79,6 +85,6 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/..
  file(APPEND "${caf_launcher}" "${FOOTER}")
  
  # This could be needed to produce shared libraries:
@@ -43,10 +43,10 @@ Index: open-coarrays-1.6.0/src/mpi/CMakeLists.txt
 +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.6.0/src/single/CMakeLists.txt
+Index: OpenCoarrays.git/src/single/CMakeLists.txt
 ===================================================================
---- open-coarrays-1.6.0.orig/src/single/CMakeLists.txt
-+++ open-coarrays-1.6.0/src/single/CMakeLists.txt
+--- OpenCoarrays.git.orig/src/single/CMakeLists.txt
++++ OpenCoarrays.git/src/single/CMakeLists.txt
 @@ -1,5 +1,8 @@
 -add_library(caf_single single.c ../common/caf_auxiliary.c)
 -target_compile_options(caf_single INTERFACE -fcoarray=lib)
@@ -59,3 +59,13 @@ Index: open-coarrays-1.6.0/src/single/CMakeLists.txt
  )
 +install(TARGETS caf_single EXPORT OpenCoarraysTargets DESTINATION lib)
 +set_target_properties(caf_single PROPERTIES SOVERSION 0d SONAME 'libcaf_single.so.0d')
+Index: OpenCoarrays.git/src/CMakeLists.txt
+===================================================================
+--- OpenCoarrays.git.orig/src/CMakeLists.txt
++++ OpenCoarrays.git/src/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-set(directories_to_build mpi tests)
++set(directories_to_build mpi single tests)
+ foreach(directory ${directories_to_build})
+   add_subdirectory(${directory})
+ endforeach()

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