diff options
Diffstat (limited to 'dev-cpp/ms-gsl')
-rw-r--r-- | dev-cpp/ms-gsl/Manifest | 5 | ||||
-rw-r--r-- | dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch | 82 | ||||
-rw-r--r-- | dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild | 34 | ||||
-rw-r--r-- | dev-cpp/ms-gsl/ms-gsl-9999.ebuild | 13 |
4 files changed, 126 insertions, 8 deletions
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index 505f7f70e2ba..e596a5c3f07e 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -1,8 +1,11 @@ AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc +AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c57b5cceac5fb0c99574c00a0bc6d4bcd7f340eb0bb452485422562549a909f0e9c85a060df468386e7d74f1a575d8554cc485f SHA512 fb4e32901d9fa7e511ccb84043c6df9d4dfb26f973c32d5d92fd389c0b20dadf3b6a749ef5b23660093cd20b280c8ade924f8e7e5af41c3a5695a3ca94c9e3c7 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726 DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca +DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696 EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a718389956488a4ac8ebdd9af9e06bd1ed7b88a203ab9290ab919c663ce4600fadc93af6ef48e6e5b259ed7567bd913 SHA512 56a1f4f52cb439a109e7c41a59266b6c0282ed1345265de6368a4e2caa57b31c1e9eb8091ebcbd1df4cfe8fa8b480479ecac59f31ff6f98e966f0775f7446b03 EBUILD ms-gsl-2.1.0.ebuild 790 BLAKE2B 410765af2d63169d15543f3ce9bc2685f01737cddb0ab19631f516e8556bed80f851104d504bd9f4513f3b56ed74d58a094887a97e02f2fd2694bfb1b6826772 SHA512 e2ea2e252a7eae5e31a60611198ef39cb576d047efe601d782e98386bb336b014b94f5f13f2c9cf2ede9f52d0a6eac946f0a559408e4573c9f6816957d771612 -EBUILD ms-gsl-9999.ebuild 738 BLAKE2B 6370f30e2e84fb7620399ea761ac22392bdb6d283a856e5f5c53b892ae9d4a2279eb6d59e388703a2b70878c987d4a26c5c073cb345dfb914b68f1b9f7849e1e SHA512 acd80384e09fe1cdb6b2c2c2e2b550df8c2a1d66b6ee5f1e92b6d76f9524f4ea36ef2af9b09f0ce277905c6fd425664f13b9df3c9a1c968e9895d98aa732290a +EBUILD ms-gsl-3.1.0.ebuild 736 BLAKE2B 6a146b5357462d04f18b5d7bc0f67040179fd541b80d0f26b1b09355024fc953f4288bd60f4eb5231c3d7609bc3da4b49d8f280c121a1c9235eb100245277c70 SHA512 d83a18b34b6d6cc0490a3519cbfd6aabc2404469f385d0729e7cb92e28d48a66a2f6f29d33848031d59e7d501e52431f6d01b9819479fe6c152036909105bd11 +EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719 diff --git a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch new file mode 100644 index 000000000000..fa8d09aafe74 --- /dev/null +++ b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch @@ -0,0 +1,82 @@ +From 727e9b8312c7ae011b667152606afc0e04ea197a Mon Sep 17 00:00:00 2001 +From: Jan Henke <Jan.Henke@taujhe.de> +Date: Sun, 14 Jun 2020 14:12:02 +0200 +Subject: [PATCH] Use system gtest instead of downloading and building it + +--- + CMakeLists.txt | 1 - + tests/CMakeLists.txt | 30 ++++-------------------------- + 2 files changed, 4 insertions(+), 27 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 740cd31..f1bf7a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.1.3...3.16) + project(GSL VERSION 3.1.0 LANGUAGES CXX) + + include(ExternalProject) +-find_package(Git) + + # Use GNUInstallDirs to provide the right locations on all platforms + include(GNUInstallDirs) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2bd1bbe..c42afb7 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -5,32 +5,9 @@ project(GSLTests CXX) + # will make visual studio generated project group files + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) +-execute_process( +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download +-) +-if(result) +- message(FATAL_ERROR "CMake step for googletest failed: ${result}") +-endif() +- +-execute_process( +- COMMAND ${CMAKE_COMMAND} --build . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download +-) +-if(result) +- message(FATAL_ERROR "CMake step for googletest failed: ${result}") +-endif() +- + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + +-add_subdirectory( +- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src +- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build +- EXCLUDE_FROM_ALL +-) ++find_package(GTest REQUIRED) + + if (MSVC AND (GSL_CXX_STANDARD EQUAL 17)) + set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-) +@@ -139,7 +116,7 @@ endif(MSVC) + + # for tests to find the gtest header + target_include_directories(gsl_tests_config SYSTEM INTERFACE +- googletest/googletest/include ++ ${GTest_INCLUDE_DIRS} + ) + + set_property(TARGET PROPERTY FOLDER "GSL_tests") +@@ -149,7 +126,8 @@ function(add_gsl_test name) + target_link_libraries(${name} + GSL + gsl_tests_config +- gtest_main ++ GTest::GTest ++ GTest::Main + ) + add_test( + ${name} +-- +2.26.2 + diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild new file mode 100644 index 000000000000..525d59e6e4c9 --- /dev/null +++ b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Guideline Support Library implementation by Microsoft" +HOMEPAGE="https://github.com/Microsoft/GSL" +SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/GSL-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +# header only library +RDEPEND="" +DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" + "${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch" +) + +src_configure() { + local mycmakeargs=( + -DGSL_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild index 767d0523e267..d7f19d2bb295 100644 --- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild +++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils git-r3 +inherit cmake git-r3 DESCRIPTION="Guideline Support Library implementation by Microsoft" HOMEPAGE="https://github.com/Microsoft/GSL" @@ -18,17 +18,16 @@ RESTRICT="!test? ( test )" # header only library RDEPEND="" -DEPEND="test? ( dev-cpp/catch:1 )" +DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )" PATCHES=( - "${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch" "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" + "${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch" ) src_configure() { local mycmakeargs=( -DGSL_TEST=$(usex test) ) - use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON ) - cmake-utils_src_configure + cmake_src_configure } |