[open-coarrays] 57/80: Don't build caf_single (won't work on GCC-7); rely on gfortran-internal version. Closes: #853586

[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 7978cbad8b9ac6836e1d4778121f3af52168a9a2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Apr 21 16:49:35 2017 +0100

    Don't build caf_single (won't work on GCC-7); rely on gfortran-internal version. Closes: #853586
---
 debian/changelog               |  7 +++++++
 debian/libcoarrays-dev.install |  1 -
 debian/patches/shared.patch    | 26 --------------------------
 debian/rules                   |  1 -
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a394e64..3c0e5fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-coarrays (1.8.6-2) UNRELEASED; urgency=medium
+
+  * Don't build caf_single (won't work on GCC-7); rely on gfortran-internal
+    version. Closes: #853586
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 21 Apr 2017 16:48:27 +0100
+
 open-coarrays (1.8.6-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/libcoarrays-dev.install b/debian/libcoarrays-dev.install
index ac6c1a0..b76a083 100644
--- a/debian/libcoarrays-dev.install
+++ b/debian/libcoarrays-dev.install
@@ -1,4 +1,3 @@
 /usr/lib/*/cmake/*
-/usr/lib/*/libcaf_single_static.a	
 /usr/lib/*/libcaf_mpi_static.a
 /usr/include
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 061341b..5599bf3 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -33,29 +33,3 @@ Index: open-coarrays-1.8.6/src/mpi/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.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)
-+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 INTERFACE -fcoarray=lib)
- install(TARGETS caf_single EXPORT OpenCoarraysTargets
-+  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+)
-+install(TARGETS caf_single_static EXPORT OpenCoarraysTargets
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- )
-+set_target_properties(caf_single PROPERTIES SOVERSION 0d SONAME 'libcaf_single.so.0d')
-Index: open-coarrays-1.8.6/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)
- foreach(directory ${directories_to_build})
-   add_subdirectory(${directory})
- endforeach()
diff --git a/debian/rules b/debian/rules
index c2d2884..050ebd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/tmp/$(LIBDIR)
-	dh_link -p libcoarrays-dev $(LIBDIR)/libcaf_single.so.0d $(LIBDIR)/libcaf_single.so
 	dh_link -p libcoarrays-dev $(LIBDIR)/libcaf_mpi.so.0d $(LIBDIR)/libcaf_mpi.so
 
 override_dh_auto_test:

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