From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98D68138334 for ; Sat, 2 Mar 2019 12:38:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3378CE0848; Sat, 2 Mar 2019 12:38:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4C61E0848 for ; Sat, 2 Mar 2019 12:38:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB375335C67 for ; Sat, 2 Mar 2019 12:38:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95172326 for ; Sat, 2 Mar 2019 12:38:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1551530273.4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/lmfit/files/lmfit-8.0-cmake.patch X-VCS-Directories: sci-libs/lmfit/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8 X-VCS-Branch: master Date: Sat, 2 Mar 2019 12:38:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 054e6c1b-79fc-40d9-91f9-137c454ad664 X-Archives-Hash: 38ce054699e9302bdb14d1bb4251f9fb commit: 4de6aef3c0de619e53aa8a2d7b7160f3c26ef7d8 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Mar 2 12:04:20 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11218 Signed-off-by: Andreas Sturmlechner 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 -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 ---- - 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() -