[open-coarrays] 49/80: update patches

[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 41b6e40847fb9879f815482deadd49607d913b67
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 20 12:18:00 2017 +0100

    update patches
---
 debian/changelog                     |  1 +
 debian/patches/disable-ns-test.patch | 68 ------------------------------------
 debian/patches/series                |  2 --
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99a55b7..908ec0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 open-coarrays (1.8.6-1) UNRELEASED; urgency=medium
 
   * New upstream release
+    - disable_ns_test.patch merged upstream
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 20 Apr 2017 12:03:50 +0100
 
diff --git a/debian/patches/disable-ns-test.patch b/debian/patches/disable-ns-test.patch
deleted file mode 100644
index 298db1e..0000000
--- a/debian/patches/disable-ns-test.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Disable navier-stokes test that fails due to hard-coded fft library
-Last-Updated: 2016-11-04
-Forwarded: not-needed
-
-Index: open-coarrays-1.7.4/CMakeLists.txt
-===================================================================
---- 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)
--      set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
--    endif()
-+    #if ( NOT (DEFINED ENV{TRAVIS}))
-+    #  add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
-+    #  set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
-+    #endif()
-   endif()
- else()
-   add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
-Index: open-coarrays-1.7.4/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
-+
- # checking whether the machine is of type 64-bit before proceeding further
--if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
--  # Default to older SSE-instruction-based FFT library
--  if (NOT (DEFINED ENV{TRAVIS}))
--    if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
--      set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
--    else()
--      message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
--      set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
--    endif()
--    add_executable( coarray_navier_stokes
--      coarray-shear_coll.F90
--      ${walltime_o}
--    )
--    target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
--  endif()
--else()
--  # Skip Navier-Stokes build until an appropriate FFT has been found.
--endif()
-+# if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
-+#   # Default to older SSE-instruction-based FFT library
-+#   if (NOT (DEFINED ENV{TRAVIS}))
-+#     if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
-+#       set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
-+#     else()
-+#       message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
-+#       set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
-+#     endif()
-+#     add_executable( coarray_navier_stokes
-+#       coarray-shear_coll.F90
-+#       ${walltime_o}
-+#     )
-+#     target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
-+#   endif()
-+# else()
-+#   # Skip Navier-Stokes build until an appropriate FFT has been found.
-+# endif()
diff --git a/debian/patches/series b/debian/patches/series
index c2d3c13..559a5ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-disable-ns-test.patch
-shared.patch
 typos.patch
 oversubscribe.patch

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