mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-06 17:47:07 -08:00
sci-libs/lmfit: fix pkgconfig and include/lib path
Closes: https://bugs.gentoo.org/981440 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -1,4 +1,6 @@
|
||||
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
||||
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
include(PreventInSourceBuilds)
|
||||
@@ -52,9 +52,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
@@ -52,7 +52,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
set(destination ${CMAKE_INSTALL_PREFIX})
|
||||
configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
|
||||
@@ -14,10 +16,7 @@
|
||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
|
||||
|
||||
include(CTest)
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
add_subdirectory(lib)
|
||||
add_subdirectory(demo)
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -19,13 +19,13 @@ link_libm(${lib})
|
||||
@@ -27,14 +26,14 @@
|
||||
- LIBRARY DESTINATION ${destination}/lib
|
||||
- RUNTIME DESTINATION ${destination}/lib
|
||||
- ARCHIVE DESTINATION ${destination}/lib
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT Libraries)
|
||||
install(
|
||||
FILES ${inc_files}
|
||||
- DESTINATION ${destination}/include
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/include
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
COMPONENT Headers)
|
||||
|
||||
if(WIN32)
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/lmfit.pc.in 2026-10-23 22:39:09.245775330 +0200
|
||||
+++ b/lmfit.pc.in 2026-10-23 22:39:56.992195999 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@destination@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${prefix}/lib
|
||||
-includedir=${prefix}/include
|
||||
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
|
||||
Name: lmfit
|
||||
Description: Levenberg-Marquardt mean-squares minimization and curve fitting
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -17,4 +17,5 @@ KEYWORDS="amd64 arm arm64 ~riscv ~x86"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-cmake.patch
|
||||
"${FILESDIR}"/${P}-pc.patch
|
||||
)
|
||||
Reference in New Issue
Block a user