summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/scitokens-cpp/Manifest2
-rw-r--r--dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch21
-rw-r--r--dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild (renamed from dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild)6
3 files changed, 4 insertions, 25 deletions
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index 76d04dd3cdfa..56804bd76620 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,2 +1,2 @@
-DIST scitokens-cpp-0.7.0.tar.gz 98971 BLAKE2B 3429ff89b5a5202f9892fc68fc558c8b64276977a396981af845f05f8eb3f638602cedd30ea97f3ab5e6d188de7249247854dd6281aeb138d6e304b5aa006bb9 SHA512 1be8a84b7d88c10ab7336c3c6bc8d7e7be5feb3253ef618cba1f3ed908aad3fc480f30dd2a292aa2774ec88ceba370af3fa7d96f228cba3df8f78b6face6991b
DIST scitokens-cpp-0.7.1.tar.gz 99411 BLAKE2B b89c63ad35105a064e6f8ecd7596ba51de43096828a756b7c64669a352784c56bcb9295638f173cdbeac833e9dfc14828daf775d60a6cd124abf639125cf5842 SHA512 5c73fcccfb2db92916caced118e2ab4e110f7a8331a9bd84d06bd059da5258d7e8423822356e1833bbce7b047d7f31e2cd20cf4c0eb064dc2d248d9febab35b5
+DIST scitokens-cpp-0.7.2.tar.gz 99557 BLAKE2B 93b5a4e331004b8bcec9b9ad931d5de2bb5ecd69dc75b4100261110aa0488f4b4616e085235dc8703f492bb80cce2d7a8e90824c32f11d9db6dec65e2be87d1f SHA512 40e4bd8b14e040f748e8b7c00a32f26028b502d293c8d4ed77f20294fe7356a991d9d0a449731cde28a90556aeefd42e4ca63ec882b94697abeef2483544451c
diff --git a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch
deleted file mode 100644
index c2b50081090e..000000000000
--- a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://github.com/scitokens/scitokens-cpp/issues/82
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec5c878..611afb1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,13 +81,12 @@ endif()
- enable_testing()
- add_subdirectory(test)
-
--else()
-+endif()
- get_directory_property(TARGETS BUILDSYSTEM_TARGETS)
- install(
- TARGETS ${TARGETS}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
--endif()
-
- install(
- FILES src/scitokens.h
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild
index 59eac5e9b48a..5d3e16ae9219 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/"${PN}"-0.7.0-install-when-testing.patch
+ "${FILESDIR}"/"${PN}"-0.7.1-fix-external-gtest.patch
)
src_prepare() {
@@ -44,8 +44,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_UNITTESTS="$(usex test)"
- -DEXTERNAL_GTEST=YES
+ -DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
+ -DSCITOKENS_EXTERNAL_GTEST=YES
)
cmake_src_configure
}