From bf9c03263f8eaf6a9fa15e4e2fe3b754fe237381 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Mon, 18 May 2020 11:58:16 +0200 Subject: [PATCH 1/2] Remove patch for executable scripts - it is in dune-common now --- packages/dune/executable_scripts.patch | 28 -------------------------- 1 file changed, 28 deletions(-) delete mode 100644 packages/dune/executable_scripts.patch diff --git a/packages/dune/executable_scripts.patch b/packages/dune/executable_scripts.patch deleted file mode 100644 index e275345..0000000 --- a/packages/dune/executable_scripts.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/scripts/CMakeLists.txt b/cmake/scripts/CMakeLists.txt -index a59060b8..0d8587f3 100644 ---- a/cmake/scripts/CMakeLists.txt -+++ b/cmake/scripts/CMakeLists.txt -@@ -1,15 +1,21 @@ -+# Install non-executable scripts - install(FILES - conf.py.in - CreateDoxyFile.cmake - envdetect.py -- extract_cmake_data.py - FinalizeHeadercheck.cmake - index.rst.in - InstallFile.cmake - main77.cc.in - module_library.cc.in - pyversion.py -- run-in-dune-env.sh.in - RunDoxygen.cmake - sphinx_cmake_dune.py - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts) -+ -+# Install executable programs -+install(PROGRAMS -+ extract_cmake_data.py -+ run-in-dune-env.sh.in -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts -+) From 3befb495557f78d5e9ba6438c3f566168991c992 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Mon, 18 May 2020 12:00:26 +0200 Subject: [PATCH 2/2] Fixup --- packages/dune/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/dune/package.py b/packages/dune/package.py index a74f563..d8a2bcb 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -207,7 +207,6 @@ class Dune(CMakePackage): depends_on('zoltan', when='+zoltan') # Apply patches - patch('executable_scripts.patch') patch('virtualenv_from_envvariable.patch', when='+testtools') def setup_build_environment(self, env):