| 1 |
commit: 4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Mar 2 12:04:20 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 12:37:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de6aef3 |
| 7 |
|
| 8 |
sci-libs/lmfit: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/11218 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-libs/lmfit/files/lmfit-8.0-cmake.patch | 59 ------------------------------ |
| 15 |
1 file changed, 59 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 367aa2147ae..00000000000 |
| 20 |
--- a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,59 +0,0 @@ |
| 23 |
-from: christoph junghans <junghans@×××××.org> |
| 24 |
-date: mon, 22 oct 2018 21:00:00 -0600 |
| 25 |
-subject: [patch] cmake: minor distribution tweaks |
| 26 |
- |
| 27 |
-- use gnuinstalldirs to allow to configure install dirs |
| 28 |
-- allow to disable injecting c flags |
| 29 |
- |
| 30 |
-signed-off-by: christoph junghans <junghans@×××××.org> |
| 31 |
---- |
| 32 |
- cmakelists.txt | 7 +++++-- |
| 33 |
- lib/cmakelists.txt | 4 ++-- |
| 34 |
- man/cmakelists.txt | 2 +- |
| 35 |
- 3 files changed, 8 insertions(+), 5 deletions(-) |
| 36 |
- |
| 37 |
-diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt |
| 38 |
---- lmfit-8.0.orig/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 |
| 39 |
-+++ lmfit-8.0/CMakeLists.txt 2018-10-22 20:56:00.573905982 -0600 |
| 40 |
-@@ -13,9 +13,12 @@ |
| 41 |
- # --- Declare project-wide user flags, and set default values --- |
| 42 |
- option(FITTEST "Build with FitTest" OFF) |
| 43 |
- |
| 44 |
--set(destination ${CMAKE_INSTALL_PREFIX}) |
| 45 |
-+include(GNUInstallDirs) |
| 46 |
- |
| 47 |
--set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") |
| 48 |
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON) |
| 49 |
-+if (INJECT_C_FLAGS) |
| 50 |
-+ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") |
| 51 |
-+endif() |
| 52 |
- |
| 53 |
- add_subdirectory(lib) |
| 54 |
- add_subdirectory(demo) |
| 55 |
-diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt |
| 56 |
---- lmfit-8.0.orig/lib/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 |
| 57 |
-+++ lmfit-8.0/lib/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 |
| 58 |
-@@ -17,9 +17,9 @@ |
| 59 |
- |
| 60 |
- install( |
| 61 |
- TARGETS ${library_name} LIBRARY |
| 62 |
-- DESTINATION ${destination}/lib |
| 63 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 64 |
- COMPONENT Libraries) |
| 65 |
- install( |
| 66 |
- FILES ${inc_files} |
| 67 |
-- DESTINATION ${destination}/include |
| 68 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
| 69 |
- COMPONENT Headers) |
| 70 |
-diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt |
| 71 |
---- lmfit-8.0.orig/man/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 |
| 72 |
-+++ lmfit-8.0/man/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 |
| 73 |
-@@ -15,7 +15,7 @@ |
| 74 |
- ) |
| 75 |
- install( |
| 76 |
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} |
| 77 |
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}" |
| 78 |
-+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" |
| 79 |
- ) |
| 80 |
- endfunction() |
| 81 |
- |
Archives