[open-coarrays] 40/80: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 13:45:47 UTC 2017
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 ea302fa38b96a8a031112667ac8b0f6b96ee61a9
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Nov 4 01:42:07 2016 +0000
refresh patches
---
debian/patches/disable-ns-test.patch | 18 +++++++++---------
debian/patches/shared.patch | 20 ++++++++++----------
debian/patches/typos.patch | 8 ++++----
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/patches/disable-ns-test.patch b/debian/patches/disable-ns-test.patch
index 21ba028..298db1e 100644
--- a/debian/patches/disable-ns-test.patch
+++ b/debian/patches/disable-ns-test.patch
@@ -1,15 +1,15 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Disable navier-stokes test that fails due to hard-coded fft library
-Last-Updated: 2016-09-15
+Last-Updated: 2016-11-04
Forwarded: not-needed
-Index: open-coarrays-1.6.0/CMakeLists.txt
+Index: open-coarrays-1.7.4/CMakeLists.txt
===================================================================
---- open-coarrays-1.6.0.orig/CMakeLists.txt
-+++ open-coarrays-1.6.0/CMakeLists.txt
-@@ -189,10 +189,10 @@ if(opencoarrays_aware_compiler)
- add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
+--- open-coarrays-1.7.4.orig/CMakeLists.txt
++++ open-coarrays-1.7.4/CMakeLists.txt
+@@ -210,10 +210,10 @@ if(opencoarrays_aware_compiler)
add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
+ add_mpi_test(asynchronous_hello_world 2 ${tests_root}/integration/events/asynchronous_hello_world)
if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
- if ( NOT (DEFINED ENV{TRAVIS}))
- add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
@@ -22,10 +22,10 @@ Index: open-coarrays-1.6.0/CMakeLists.txt
endif()
else()
add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
-Index: open-coarrays-1.7.0/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
+Index: open-coarrays-1.7.4/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
===================================================================
---- open-coarrays-1.7.0.orig/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
-+++ open-coarrays-1.7.0/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
+--- open-coarrays-1.7.4.orig/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
++++ open-coarrays-1.7.4/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
@@ -1,19 +1,21 @@
+## Skipping this, as we need to link -fPIC which breaks
+
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 54a9ca6..89d711c 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -1,13 +1,13 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Add shared, static versions of libraries
Forwarded: no
-Last-Updated: 2016-06-03
+Last-Updated: 2016-11-04
TODO: Make this work without _static
-Index: OpenCoarrays.git/src/mpi/CMakeLists.txt
+Index: open-coarrays-1.7.4/src/mpi/CMakeLists.txt
===================================================================
---- OpenCoarrays.git.orig/src/mpi/CMakeLists.txt
-+++ OpenCoarrays.git/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)
endif()
@@ -43,10 +43,10 @@ Index: OpenCoarrays.git/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: OpenCoarrays.git/src/single/CMakeLists.txt
+Index: open-coarrays-1.7.4/src/single/CMakeLists.txt
===================================================================
---- OpenCoarrays.git.orig/src/single/CMakeLists.txt
-+++ OpenCoarrays.git/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 @@
-add_library(caf_single single.c ../common/caf_auxiliary.c)
-target_compile_options(caf_single INTERFACE -fcoarray=lib)
@@ -59,10 +59,10 @@ Index: OpenCoarrays.git/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
+Index: open-coarrays-1.7.4/src/CMakeLists.txt
===================================================================
---- OpenCoarrays.git.orig/src/CMakeLists.txt
-+++ OpenCoarrays.git/src/CMakeLists.txt
+--- open-coarrays-1.7.4.orig/src/CMakeLists.txt
++++ open-coarrays-1.7.4/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(directories_to_build mpi tests)
+set(directories_to_build mpi single tests)
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 3679eb2..c77fdd2 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Case error causes bash failure
-Last-Updated: 2016-06-03
+Last-Updated: 2016-11-04
Forwarded: no
-Index: open-coarrays-1.7.0/src/extensions/cafrun-foot
+Index: open-coarrays-1.7.4/src/extensions/cafrun-foot
===================================================================
---- open-coarrays-1.7.0.orig/src/extensions/cafrun-foot
-+++ open-coarrays-1.7.0/src/extensions/cafrun-foot
+--- open-coarrays-1.7.4.orig/src/extensions/cafrun-foot
++++ open-coarrays-1.7.4/src/extensions/cafrun-foot
@@ -1,4 +1,4 @@
-Usage()
+usage()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/open-coarrays.git
More information about the debian-science-commits
mailing list