diff options
| author | dbj <dbj@pkgsrc.org> | 2020-11-29 22:39:10 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2020-11-29 22:39:10 +0000 |
| commit | d0e6468fc206a3e0f9681f0062b80014010add18 (patch) | |
| tree | df85a69088797d17ba66cc8d74182af4ee1eba73 /math | |
| parent | a4dab85da4e301a8d334c8d09e341d984a131499 (diff) | |
| download | pkgsrc-d0e6468fc206a3e0f9681f0062b80014010add18.tar.gz | |
math/qhull: fix build on case insensitive build dirs
rename a cmake config directory that conflicts with target binary name
Diffstat (limited to 'math')
| -rw-r--r-- | math/qhull/distinfo | 3 | ||||
| -rw-r--r-- | math/qhull/patches/patch-CMakeLists.txt | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/math/qhull/distinfo b/math/qhull/distinfo index f08a72ef7af..8fc04aa64f5 100644 --- a/math/qhull/distinfo +++ b/math/qhull/distinfo @@ -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 --git a/math/qhull/patches/patch-CMakeLists.txt b/math/qhull/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..c161b9d9da1 --- /dev/null +++ b/math/qhull/patches/patch-CMakeLists.txt @@ -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 |