diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 21:05:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 21:05:47 +0000 |
commit | 60f657b5e6155f26601c7def7baa11cee72246d0 (patch) | |
tree | 25aecda1c8de352c03f653934407abebf384a560 /dev-cpp/ms-gsl | |
parent | e523ebcd50638ebe53f8f425d126bfa7385703b5 (diff) |
gentoo auto-resync : 01:02:2023 - 21:05:47
Diffstat (limited to 'dev-cpp/ms-gsl')
-rw-r--r-- | dev-cpp/ms-gsl/Manifest | 3 | ||||
-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 |
3 files changed, 0 insertions, 119 deletions
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index ecf50683ed7f..f1bd21733d2e 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -1,8 +1,5 @@ AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b -AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c57b5cceac5fb0c99574c00a0bc6d4bcd7f340eb0bb452485422562549a909f0e9c85a060df468386e7d74f1a575d8554cc485f SHA512 fb4e32901d9fa7e511ccb84043c6df9d4dfb26f973c32d5d92fd389c0b20dadf3b6a749ef5b23660093cd20b280c8ade924f8e7e5af41c3a5695a3ca94c9e3c7 -DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696 DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29 -EBUILD ms-gsl-3.1.0.ebuild 758 BLAKE2B df50b3032701baac02546d84da973b5a1aefa6f03ac1580949693c6e7db96b3b12a02f7c207a947f4c6661300842af661cebb084f0fb3ed3335094ba5980e6f5 SHA512 166b99b80ed80447f9b826a26dbfc0fb786add6c1381abe9bce349a7991cd6a0b25efb1b8fecdad24e8519a3d12ca8b40e0276b758699f3495026a33f8d3c5f9 EBUILD ms-gsl-4.0.0.ebuild 704 BLAKE2B e3080d85782bcea39187596792edfb5dc6d56babeb64424c1675f23c0840384e88ad63493f03b731dc10ca2353db3bff15bb775f1befc7ed09c9a936227af229 SHA512 ca294f223004a03232215b2964333607645442fbe2e3794deebe1f9764480927161fd2e31dfc74aa050ca0ef6694747de155d2a12d901621054d007c800a65e2 EBUILD ms-gsl-9999.ebuild 633 BLAKE2B 733c6f2ece34314ca2af2fd9f8521dfc52212e0cf90207e595d09ef66f213d7dd78fd5803615084040552a717893064375e4c4e28675464ca8c21dae78664fb5 SHA512 842ee3cdb24d17675b7033b5e0a8b75f99c736fb5449326d4c109d7ddbc8cadc8779880632bb7a1e1086e7db0a9ec6bb1d10dad9c499a178fb903cc635a3c801 MISC metadata.xml 467 BLAKE2B f30f6175d21dfc95ece2a0352c2a5f67e50079ebe7b2c8be813edc18fe539d3005f1c42b1fcc41c386032893fe7270833136dabab0bcf1cc81b53b8987eb0292 SHA512 2fa2e9a4f9568587274bed47a29484d19f8695f1fea385eecda146f2141a43118419624b5dd71769f00967d7082bbc9a5276f7e0c1c2efda6c3d406c7371ca54 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 deleted file mode 100644 index fa8d09aafe74..000000000000 --- a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch +++ /dev/null @@ -1,82 +0,0 @@ -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 deleted file mode 100644 index f5c2d7ee0cec..000000000000 --- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv 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 -} |