diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.recipe b/sci-libs/libspatialindex/libspatialindex-1.9.3.recipe index 2ac478f98..4c9efd164 100644 --- a/sci-libs/libspatialindex/libspatialindex-1.9.3.recipe +++ b/sci-libs/libspatialindex/libspatialindex-1.9.3.recipe @@ -3,10 +3,11 @@ DESCRIPTION="Extensible framework that supports robust spatial indexing methods HOMEPAGE="https://libspatialindex.org/" COPYRIGHT="Marios Hadjieleftheriou" LICENSE="MIT" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/libspatialindex/libspatialindex/releases/download/$portVersion/spatialindex-src-$portVersion.tar.bz2" CHECKSUM_SHA256="4a529431cfa80443ab4dcd45a4b25aebbabe1c0ce2fa1665039c80e999dcc50a" SOURCE_DIR="spatialindex-src-$portVersion" +PATCHES="libspatialindex-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -55,7 +56,10 @@ BUILD_PREREQUIRES=" BUILD() { cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ - $cmakeDirArgs -DSIDX_BUILD_TESTS=ON + -DCMAKE_INSTALL_PREFIX=$prefix \ + -DSIDX_INCLUDE_SUBDIR=$includeDir \ + -DLIB_SUFFIX=$secondaryArchSubDir \ + -DSIDX_BUILD_TESTS=ON make -C build $jobArgs } @@ -63,15 +67,6 @@ INSTALL() { make -C build install - mkdir -p $includeDir - mv $prefix/include/spatialindex $includeDir - rm -rf $prefix/include - - if [ -n "$secondaryArchSuffix" ]; then - mkdir -p $libDir - mv $prefix/lib/*.so* $libDir - fi - prepareInstalledDevelLibs libspatialindex libspatialindex_c # devel package diff --git a/sci-libs/libspatialindex/patches/libspatialindex-1.9.3.patchset b/sci-libs/libspatialindex/patches/libspatialindex-1.9.3.patchset new file mode 100644 index 000000000..88ad10f7f --- /dev/null +++ b/sci-libs/libspatialindex/patches/libspatialindex-1.9.3.patchset @@ -0,0 +1,20 @@ +From c4adb58622da2568c05b2f1b19651f3f7f394a70 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Wed, 19 Apr 2023 12:39:22 +0200 +Subject: Fix header installation path + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 90f4501..0ad464b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -263,5 +263,5 @@ install(TARGETS ${SIDX_LIB_NAME} ${SIDX_C_LIB_NAME} + ARCHIVE DESTINATION ${SIDX_LIB_DIR}) + + install(DIRECTORY ${SIDX_HEADERS_DIR} +- DESTINATION include/spatialindex ++ DESTINATION ${SIDX_INCLUDE_SUBDIR}/spatialindex + FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") +-- +2.37.3 +