From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/
Date: Sat, 2 Mar 2019 12:38:02 +0000 (UTC) [thread overview]
Message-ID: <1551530273.4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8.asturm@gentoo> (raw)
commit: 4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Mar 2 12:04:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 12:37:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de6aef3
sci-libs/lmfit: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11218
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/lmfit/files/lmfit-8.0-cmake.patch | 59 ------------------------------
1 file changed, 59 deletions(-)
diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
deleted file mode 100644
index 367aa2147ae..00000000000
--- a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-from: christoph junghans <junghans@votca.org>
-date: mon, 22 oct 2018 21:00:00 -0600
-subject: [patch] cmake: minor distribution tweaks
-
-- use gnuinstalldirs to allow to configure install dirs
-- allow to disable injecting c flags
-
-signed-off-by: christoph junghans <junghans@votca.org>
----
- cmakelists.txt | 7 +++++--
- lib/cmakelists.txt | 4 ++--
- man/cmakelists.txt | 2 +-
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt
---- lmfit-8.0.orig/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/CMakeLists.txt 2018-10-22 20:56:00.573905982 -0600
-@@ -13,9 +13,12 @@
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
-
--set(destination ${CMAKE_INSTALL_PREFIX})
-+include(GNUInstallDirs)
-
--set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas")
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
-+if (INJECT_C_FLAGS)
-+ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas")
-+endif()
-
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt
---- lmfit-8.0.orig/lib/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/lib/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600
-@@ -17,9 +17,9 @@
-
- install(
- TARGETS ${library_name} LIBRARY
-- DESTINATION ${destination}/lib
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT Libraries)
- install(
- FILES ${inc_files}
-- DESTINATION ${destination}/include
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT Headers)
-diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt
---- lmfit-8.0.orig/man/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/man/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600
-@@ -15,7 +15,7 @@
- )
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
-+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
- )
- endfunction()
-
next reply other threads:[~2019-03-02 12:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 12:38 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-11-23 20:37 [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/ Conrad Kostecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1551530273.4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox