summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Lamm <expeditioneer@gentoo.org>2021-03-06 07:38:53 +0100
committerDennis Lamm <expeditioneer@gentoo.org>2021-03-06 11:02:37 +0100
commit4ef95ff8de20aaa290cc8cdf5bafed989b6f4b64 (patch)
treec113c57939c4eb4bfc4195592336cb1161400d72 /sci-libs/libspatialindex
parentmail-mta/courier: Version bump (diff)
downloadgentoo-4ef95ff8de20aaa290cc8cdf5bafed989b6f4b64.tar.gz
gentoo-4ef95ff8de20aaa290cc8cdf5bafed989b6f4b64.tar.bz2
gentoo-4ef95ff8de20aaa290cc8cdf5bafed989b6f4b64.zip
sci-libs/libspatialindex: fixed werror
Using system provided gtest instead of bundled one Closes: https://bugs.gentoo.org/show_bug.cgi?id=764305 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Package-Manager: Portage-3.0.13, Repoman-3.0.2 Closes: https://github.com/gentoo/gentoo/pull/19791 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>
Diffstat (limited to 'sci-libs/libspatialindex')
-rw-r--r--sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch12
-rw-r--r--sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild37
2 files changed, 49 insertions, 0 deletions
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
new file mode 100644
index 000000000000..996fc9b96921
--- /dev/null
+++ b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
@@ -0,0 +1,12 @@
+diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
+--- a/test/gtest/CMakeLists.txt (revision 5a08124d541319d39886710afc1d61dfff5575a1)
++++ b/test/gtest/CMakeLists.txt (date 1615011059253)
+@@ -1,8 +1,5 @@
+ set (GOOGLETEST_VERSION "1.10.0")
+
+-add_subdirectory(gtest-1.10.0)
+-include_directories(./gtest-1.10.0/include)
+-
+ set (SOURCES
+ test.h
+ sidx_api_test.h
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..bee01dbe1971
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="spatialindex-src-${PV}"
+
+DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"
+HOMEPAGE="https://libspatialindex.org/
+ https://github.com/libspatialindex/libspatialindex"
+SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-compiler-flags.patch
+ "${FILESDIR}"/${P}-use-system-gtest.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DSIDX_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}