pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/qhull math/qhull: fix build on case insensitive b...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5cb5e71c4994
branches: trunk
changeset: 442751:5cb5e71c4994
user: dbj <dbj%pkgsrc.org@localhost>
date: Sun Nov 29 22:39:10 2020 +0000
description:
math/qhull: fix build on case insensitive build dirs
rename a cmake config directory that conflicts with target binary name
diffstat:
math/qhull/distinfo | 3 +-
math/qhull/patches/patch-CMakeLists.txt | 40 +++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletions(-)
diffs (56 lines):
diff -r 0711a1ddbf4e -r 5cb5e71c4994 math/qhull/distinfo
--- a/math/qhull/distinfo Sun Nov 29 22:35:47 2020 +0000
+++ b/math/qhull/distinfo Sun Nov 29 22:39:10 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/04/12 21:15:01 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/11/29 22:39:10 dbj Exp $
SHA1 (qhull-2019-src-7.3.2.tgz) = c7165fb7ec1af92bf448370c3a3b554766168f18
RMD160 (qhull-2019-src-7.3.2.tgz) = cb7de690c87a050eb073e24458334d4da6e157d9
SHA512 (qhull-2019-src-7.3.2.tgz) = efcaf2af45f3c401f5f677cac8e3ffc056f870bf62f852982ca880282c428920fad13071017b8d8b7b6fc416380c6f3fe6973aa0b37a2322c234774325b14f1c
Size (qhull-2019-src-7.3.2.tgz) = 1236686 bytes
+SHA1 (patch-CMakeLists.txt) = 06df209a7186bb953b195a251efd436fc95b4582
diff -r 0711a1ddbf4e -r 5cb5e71c4994 math/qhull/patches/patch-CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/qhull/patches/patch-CMakeLists.txt Sun Nov 29 22:39:10 2020 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/11/29 22:39:10 dbj Exp $
+
+Fix build on case insensitive build dirs where a created
+cmake configuration directory conflicts with the output binary.
+
+--- CMakeLists.txt.orig 2019-06-29 00:19:28.000000000 +0000
++++ CMakeLists.txt
+@@ -626,18 +626,18 @@ install(TARGETS ${qhull_TARGETS_INSTALL}
+ include(CMakePackageConfigHelpers)
+
+ write_basic_package_version_file(
+- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/Qhull_cmake/QhullConfigVersion.cmake"
+ VERSION ${qhull_VERSION}
+ COMPATIBILITY AnyNewerVersion
+ )
+
+ export(EXPORT QhullTargets
+- FILE "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullTargets.cmake"
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/Qhull_cmake/QhullTargets.cmake"
+ NAMESPACE Qhull::
+ )
+
+ configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
+- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/Qhull_cmake/QhullConfig.cmake"
+ @ONLY
+ )
+
+@@ -652,8 +652,8 @@ install(EXPORT QhullTargets
+ )
+ install(
+ FILES
+- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
+- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/Qhull_cmake/QhullConfig.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/Qhull_cmake/QhullConfigVersion.cmake"
+ DESTINATION
+ ${ConfigPackageLocation}
+ COMPONENT
Home |
Main Index |
Thread Index |
Old Index