diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 23:54:25 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 23:54:25 +0000 |
| commit | f443475c824b4b5c086e6d040961cb35ad81bc60 (patch) | |
| tree | 6a6b4078e5565d11ab153a37a39af2d57becea34 /sci-chemistry/gromacs/files | |
| parent | 407525b571b48cfd65e1ad7a02d250a927c967c9 (diff) | |
gentoo resync : 02.12.2017
Diffstat (limited to 'sci-chemistry/gromacs/files')
| -rw-r--r-- | sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch b/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch new file mode 100644 index 000000000000..2ed6a19f31b0 --- /dev/null +++ b/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch @@ -0,0 +1,71 @@ +From 81e68584512b21ec572d2561c25a1b19982aa0be Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru> +Date: Fri, 1 Dec 2017 17:12:36 +0300 +Subject: [PATCH] Fix build with cmake 3.10 on Linux + +Without this fix cmake will fail with + +-- Detecting CXX compiler ABI info - done +-- Detecting CXX compile features +-- Detecting CXX compile features - done +CMake Error at cmake/gmxCTestUtilities.cmake:56 (file): + file STRINGS file + "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/DartConfiguration.tcl" + cannot be read. +Call Stack (most recent call first): + CMakeLists.txt:89 (gmx_ctest_init) + +-- Performing Test CXXFLAG_STD_CXX0X +-- Performing Test CXXFLAG_STD_CXX0X - Success +-- Performing Test CXX11_SUPPORTED +-- Performing Test CXX11_SUPPORTED - Success +.... +.... +.... +-- Looking for inttypes.h +-- Looking for inttypes.h - found +-- <<< Gentoo configuration >>> +Build type Gentoo +Install path /usr +Compiler flags: +C -march=core-avx2 -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2 +C++ -march=core-avx2 -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2 -std=c++11 +Linker flags: +Executable -Wl,-O1 -Wl,--as-needed +Module -Wl,-O1 -Wl,--as-needed +Shared -Wl,-O1 -Wl,--as-needed + +-- Configuring incomplete, errors occurred! +See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeOutput.log". +See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeError.log". + +Change-Id: Ie04c2e5f5884f05c3648fed7289157e73fd8d81f +Signed-off-by: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru> +--- + cmake/gmxCTestUtilities.cmake | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/cmake/gmxCTestUtilities.cmake b/cmake/gmxCTestUtilities.cmake +index 89715f910..3685df648 100644 +--- a/cmake/gmxCTestUtilities.cmake ++++ b/cmake/gmxCTestUtilities.cmake +@@ -50,10 +50,12 @@ macro (gmx_ctest_init) + set(MEMORYCHECK_TYPE "AddressSanitizer") + endif() + include(CTest) +- # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest +- # does not work without this... +- set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl") +- file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ") ++ if(APPLE) ++ # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest ++ # does not work without this... ++ set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl") ++ file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ") ++ endif() + if (NOT _existing) + file(APPEND ${_ctest_config_file} "\nCMakeCommand: ${CMAKE_COMMAND}\n") + endif() +-- +2.15.0 + |