1 |
commit: ac26cb79f4b69b93b6b926f27465c38b511efe6d |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Tue Nov 16 16:54:48 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 23 20:32:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac26cb79 |
7 |
|
8 |
sci-libs/lmfit: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/22971 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch | 85 ---------------------------- |
16 |
1 file changed, 85 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch |
19 |
deleted file mode 100644 |
20 |
index 482ecebe8294..000000000000 |
21 |
--- a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch |
22 |
+++ /dev/null |
23 |
@@ -1,85 +0,0 @@ |
24 |
-From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001 |
25 |
-From: christoph junghans <junghans@×××××.org> |
26 |
-Date: Mon, 22 Oct 2018 21:00:00 -0600 |
27 |
-Subject: [PATCH] cmake: minor distribution tweaks |
28 |
- |
29 |
-- use gnuinstalldirs to allow to configure install dirs |
30 |
-- allow to disable injecting c flags |
31 |
- |
32 |
-signed-off-by: christoph junghans <junghans@×××××.org> |
33 |
-Signed-off-by: Alexey Shvetsov <alexxy@g.o> |
34 |
---- |
35 |
- CMakeLists.txt | 10 +++++++--- |
36 |
- lib/CMakeLists.txt | 4 ++-- |
37 |
- man/CMakeLists.txt | 4 ++-- |
38 |
- 3 files changed, 11 insertions(+), 7 deletions(-) |
39 |
- |
40 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
41 |
-index dbb571e..279f06a 100644 |
42 |
---- a/CMakeLists.txt |
43 |
-+++ b/CMakeLists.txt |
44 |
-@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW) |
45 |
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) |
46 |
- include(PreventInSourceBuilds) |
47 |
- |
48 |
--project(lmfit VERSION 8.2.1 LANGUAGES C) |
49 |
-+project(lmfit VERSION 8.2.2 LANGUAGES C) |
50 |
- |
51 |
- # --- Declare project-wide user flags, and set default values --- |
52 |
- option(FITTEST "Build with FitTest" OFF) |
53 |
-@@ -23,12 +23,16 @@ else() |
54 |
- endif() |
55 |
- |
56 |
- include(CTest) |
57 |
-+include(GNUInstallDirs) |
58 |
- |
59 |
--set(destination ${CMAKE_INSTALL_PREFIX}) |
60 |
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON) |
61 |
-+if (INJECT_C_FLAGS) |
62 |
-+ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") |
63 |
-+endif() |
64 |
- |
65 |
- configure_file("lmfit.pc.in" "lmfit.pc" @ONLY) |
66 |
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc" |
67 |
-- DESTINATION "${destination}/lib/pkgconfig/") |
68 |
-+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") |
69 |
- |
70 |
- add_subdirectory(lib) |
71 |
- add_subdirectory(demo) |
72 |
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt |
73 |
-index a266f4e..e071a3c 100644 |
74 |
---- a/lib/CMakeLists.txt |
75 |
-+++ b/lib/CMakeLists.txt |
76 |
-@@ -18,9 +18,9 @@ link_libm(${library_name}) |
77 |
- |
78 |
- install( |
79 |
- TARGETS ${library_name} LIBRARY |
80 |
-- DESTINATION ${destination}/lib |
81 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
82 |
- COMPONENT Libraries) |
83 |
- install( |
84 |
- FILES ${inc_files} |
85 |
-- DESTINATION ${destination}/include |
86 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
87 |
- COMPONENT Headers) |
88 |
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt |
89 |
-index d4595fd..5505713 100644 |
90 |
---- a/man/CMakeLists.txt |
91 |
-+++ b/man/CMakeLists.txt |
92 |
-@@ -15,11 +15,11 @@ function(one_page pname section) |
93 |
- ) |
94 |
- install( |
95 |
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} |
96 |
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}" |
97 |
-+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" |
98 |
- ) |
99 |
- install( |
100 |
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html |
101 |
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html" |
102 |
-+ DESTINATION "${CMAKE_INSTALL_DOCDIR}/html" |
103 |
- ) |
104 |
- endfunction() |
105 |
- |
106 |
--- |
107 |
-2.20.1 |
108 |
- |