Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/hoomd-blue/files/
Date: Tue, 31 Jan 2017 08:42:34
Message-Id: 1485852123.d580443b7849312edf5e6115a997fbec2a3ae0df.soap@gentoo
1 commit: d580443b7849312edf5e6115a997fbec2a3ae0df
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 18:01:53 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:42:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d580443b
7
8 sci-physics/hoomd-blue: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 .../hoomd-blue/files/hoomd-blue-2.0.1-cxx11.patch | 53 ----------------------
13 1 file changed, 53 deletions(-)
14
15 diff --git a/sci-physics/hoomd-blue/files/hoomd-blue-2.0.1-cxx11.patch b/sci-physics/hoomd-blue/files/hoomd-blue-2.0.1-cxx11.patch
16 deleted file mode 100644
17 index 523c4f6..00000000
18 --- a/sci-physics/hoomd-blue/files/hoomd-blue-2.0.1-cxx11.patch
19 +++ /dev/null
20 @@ -1,53 +0,0 @@
21 -From 7dce8d65ad8069c6a7fdb89ebea13f55d2db8182 Mon Sep 17 00:00:00 2001
22 -From: "Joshua A. Anderson" <joaander@×××××.edu>
23 -Date: Wed, 20 Jul 2016 14:44:07 -0400
24 -Subject: [PATCH] Always add -std=c++11 to CXX_FLAGS
25 -
26 -refs #173
27 ----
28 - CMake/hoomd/HOOMDCFlagsSetup.cmake | 18 ++++++++++--------
29 - 1 file changed, 10 insertions(+), 8 deletions(-)
30 -
31 -diff --git a/CMake/hoomd/HOOMDCFlagsSetup.cmake b/CMake/hoomd/HOOMDCFlagsSetup.cmake
32 -index 2655913..db503b3 100644
33 ---- a/CMake/hoomd/HOOMDCFlagsSetup.cmake
34 -+++ b/CMake/hoomd/HOOMDCFlagsSetup.cmake
35 -@@ -32,10 +32,10 @@ if(NOT PASSED_FIRST_CONFIGURE)
36 - set(CMAKE_C_FLAGS_RELEASE "-march=${GCC_ARCH} -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas" CACHE STRING "Flags used by the compiler during release builds." FORCE)
37 - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-march=${GCC_ARCH} -g -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
38 -
39 -- set(CMAKE_CXX_FLAGS_DEBUG "-march=${GCC_ARCH} -g -Wall -Wno-unknown-pragmas -std=c++11" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
40 -- set(CMAKE_CXX_FLAGS_MINSIZEREL "-march=${GCC_ARCH} -Os -Wall -Wno-unknown-pragmas -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
41 -- set(CMAKE_CXX_FLAGS_RELEASE "-march=${GCC_ARCH} -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas -std=c++11" CACHE STRING "Flags used by the compiler during release builds." FORCE)
42 -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-march=${GCC_ARCH} -g -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas -std=c++11" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
43 -+ set(CMAKE_CXX_FLAGS_DEBUG "-march=${GCC_ARCH} -g -Wall -Wno-unknown-pragmas" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
44 -+ set(CMAKE_CXX_FLAGS_MINSIZEREL "-march=${GCC_ARCH} -Os -Wall -Wno-unknown-pragmas -DNDEBUG" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
45 -+ set(CMAKE_CXX_FLAGS_RELEASE "-march=${GCC_ARCH} -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas" CACHE STRING "Flags used by the compiler during release builds." FORCE)
46 -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-march=${GCC_ARCH} -g -O3 -funroll-loops -DNDEBUG -Wall -Wno-unknown-pragmas" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
47 -
48 - elseif(CMAKE_CXX_COMPILER MATCHES "icpc")
49 - # default flags for intel
50 -@@ -44,10 +44,10 @@ if(NOT PASSED_FIRST_CONFIGURE)
51 - set(CMAKE_C_FLAGS_RELEASE "-xHOST -O3 -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds." FORCE)
52 - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-xHOST -g -O3 -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
53 -
54 -- set(CMAKE_CXX_FLAGS_DEBUG "-xHOST -O0 -g -std=c++11" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
55 -- set(CMAKE_CXX_FLAGS_MINSIZEREL "-xHOST -Os -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
56 -- set(CMAKE_CXX_FLAGS_RELEASE "-xHOST -O3 -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during release builds." FORCE)
57 -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xHOST -g -O3 -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
58 -+ set(CMAKE_CXX_FLAGS_DEBUG "-xHOST -O0 -g" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
59 -+ set(CMAKE_CXX_FLAGS_MINSIZEREL "-xHOST -Os -DNDEBUG" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
60 -+ set(CMAKE_CXX_FLAGS_RELEASE "-xHOST -O3 -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds." FORCE)
61 -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xHOST -g -O3 -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
62 -
63 - else(CMAKE_COMPILER_IS_GNUCXX)
64 - message(STATUS "No default CXXFLAGS for your compiler, set them manually")
65 -@@ -64,3 +64,5 @@ if(NOT PASSED_FIRST_CONFIGURE)
66 -
67 - SET(PASSED_FIRST_CONFIGURE ON CACHE INTERNAL "First configure has run: CXX_FLAGS have had their defaults changed" FORCE)
68 - endif(NOT PASSED_FIRST_CONFIGURE)
69 -+
70 -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
71 ---
72 -2.7.3
73 -