[open-coarrays] 59/80: Build --no-parallel; fix race condition. Closes: #860853

[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 873289032b728a1f3d0e6c21240d1867afa23ce7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Apr 23 21:06:26 2017 +0100

    Build --no-parallel; fix race condition. Closes: #860853
---
 debian/changelog               | 1 +
 debian/libcoarrays-dev.install | 1 +
 debian/libcoarrays0d.install   | 2 +-
 debian/patches/shared.patch    | 2 +-
 debian/rules                   | 8 +-------
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79bb68f..c38eab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ open-coarrays (1.8.6-2) unstable; urgency=medium
   * Don't build caf_single (won't work on GCC-7); rely on gfortran-internal
     version. Closes: #853586
   * Add missing symlink for so 1.8.6; Closes: #861001
+  * Build --no-parallel; fix race condition. Closes: #860853
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 21 Apr 2017 16:48:27 +0100
 
diff --git a/debian/libcoarrays-dev.install b/debian/libcoarrays-dev.install
index b76a083..0bed832 100644
--- a/debian/libcoarrays-dev.install
+++ b/debian/libcoarrays-dev.install
@@ -1,3 +1,4 @@
 /usr/lib/*/cmake/*
 /usr/lib/*/libcaf_mpi_static.a
+/usr/lib/*/libcaf_mpi.so
 /usr/include
diff --git a/debian/libcoarrays0d.install b/debian/libcoarrays0d.install
index 62d4766..b408d74 100644
--- a/debian/libcoarrays0d.install
+++ b/debian/libcoarrays0d.install
@@ -1 +1 @@
-/usr/lib/*/libcaf*0d
+/usr/lib/*/libcaf_mpi.so.*
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 5599bf3..82d99e4 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -29,7 +29,7 @@ Index: open-coarrays-1.8.6/src/mpi/CMakeLists.txt
    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
  )
-+set_target_properties(caf_mpi PROPERTIES SOVERSION 0d SONAME 'libcaf_mpi.so.0d')
++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}")
diff --git a/debian/rules b/debian/rules
index 9f00c00..2bac13b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # The magic debhelper  rule
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --buildsystem=cmake --no-parallel
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # DISABLED_TESTS:= "powerpc alpha"
@@ -15,12 +15,6 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 override_dh_auto_configure:
 	        CC=mpicc FC=mpifort dh_auto_configure
 
-override_dh_auto_install:
-	dh_auto_install
-	mkdir -p debian/tmp/$(LIBDIR)
-	dh_link -p libcoarrays-dev $(LIBDIR)/libcaf_mpi.so.1.8.6 $(LIBDIR)/libcaf_mpi.so
-	dh_link -p libcoarrays0d $(LIBDIR)/libcaf_mpi.so.1.8.6 $(LIBDIR)/libcaf_mpi.so.1
-
 override_dh_auto_test:
 ifneq (,$(findstring  "$(DEB_HOST_ARCH)",$(DISABLED_TESTS)))
 	@echo "Tests disabled on this arch: known failures being investigated"

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