From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- sci-libs/lmfit/Manifest | 1 - sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch | 85 ---------------------------- 2 files changed, 86 deletions(-) delete mode 100644 sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch (limited to 'sci-libs/lmfit') diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index 12d59a5d3ffd..0d4542dd7788 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,4 +1,3 @@ -AUX lmfit-8.2.2-cmake.patch 2752 BLAKE2B 2a0d3cf9a4e206fe346257c62cbfa482fa60562a948d76dc3cb9e8060faca3d0e80bb706b8d9593ca1b4894a659542dff06684bfa9829216f6c07e2dcb9e4618 SHA512 7a20814d311ed768e02bb17e32802c017bb148e3877fecc8ef9a13ace865dfed403cc8fb7811aba12655166e0eafb59e8e60edbb4346b7c56553bb79d4cd608e AUX lmfit-9.0-cmake.patch 1599 BLAKE2B e0f4783b64436845a12f8ca0a45f93d4964dba3855adeb73cb466c1bc0b8652610f8fa610e816db33c0f027db0b86233c01358245cd42a2284e718b76c964b18 SHA512 7256873a0620a429c231cdd296a6dcf6dffd4caa2468f7a91ca0d3943488753155aeb32bdc5813e1404c52ca2ea9bdf48b7ecf736e1348a1b36c0fd8d555f0c3 DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1 EBUILD lmfit-9.0-r1.ebuild 504 BLAKE2B 656f6bfbc4f531e727e9234d5c77248f220c3440ea6a154aff5d6a843c3d0bd6bac71e5367b1201d89f3441bf99252fa7ad941a3e829b2186c70fc275b1c7d1b SHA512 8b2a4f817175aba9c8b645a984ea86e7ed76105a7974a5c6ef63147b2fc807570869f734efd780e76ff09a485dc52693e53ed19ae9b6d2f62860551611d07d0a diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch deleted file mode 100644 index 482ecebe8294..000000000000 --- a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001 -From: christoph junghans -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 -Signed-off-by: Alexey Shvetsov ---- - CMakeLists.txt | 10 +++++++--- - lib/CMakeLists.txt | 4 ++-- - man/CMakeLists.txt | 4 ++-- - 3 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbb571e..279f06a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - include(PreventInSourceBuilds) - --project(lmfit VERSION 8.2.1 LANGUAGES C) -+project(lmfit VERSION 8.2.2 LANGUAGES C) - - # --- Declare project-wide user flags, and set default values --- - option(FITTEST "Build with FitTest" OFF) -@@ -23,12 +23,16 @@ else() - endif() - - include(CTest) -+include(GNUInstallDirs) - --set(destination ${CMAKE_INSTALL_PREFIX}) -+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() - - configure_file("lmfit.pc.in" "lmfit.pc" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc" -- DESTINATION "${destination}/lib/pkgconfig/") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") - - add_subdirectory(lib) - add_subdirectory(demo) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index a266f4e..e071a3c 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -18,9 +18,9 @@ link_libm(${library_name}) - - 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 --git a/man/CMakeLists.txt b/man/CMakeLists.txt -index d4595fd..5505713 100644 ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -15,11 +15,11 @@ function(one_page pname section) - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}" -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html -- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html" -+ DESTINATION "${CMAKE_INSTALL_DOCDIR}/html" - ) - endfunction() - --- -2.20.1 - -- cgit v1.2.3