commit: eb7dc5994af6aef7d3929e982746917a860f694b Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Wed Nov 6 19:33:06 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Wed Nov 6 19:34:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7dc599
dev-libs/cpuinfo: add 2024.10.22 drop 2022.08.19 2023.01.13 2022.03.26 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-libs/cpuinfo/Manifest | 4 +- dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild | 42 --------------------- dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild | 43 ---------------------- ...2.03.26-r1.ebuild => cpuinfo-2024.10.22.ebuild} | 19 +++------- .../cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch | 25 ------------- 5 files changed, 7 insertions(+), 126 deletions(-) diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest index 11981c5f1443..6cab1be16ded 100644 --- a/dev-libs/cpuinfo/Manifest +++ b/dev-libs/cpuinfo/Manifest @@ -1,4 +1,2 @@ -DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c -DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2 -DIST cpuinfo-2023.01.13.tar.gz 3513605 BLAKE2B eee9765f30b1dca6f39fb0b1f387f5e1cfaf544e5c9b256391aea913c5b67a012ef45f5afecfcda4a34ab64ca8da2f20e37db58cb4d463f8e312a04965cd40df SHA512 96bd11d3453e98cf1130f0862614e813861e20111655f8c472f29f17048a07d712b4f84b511760fdee995cf3d695112371af0c21cbd144ee3fb6fb6153dd2829 DIST cpuinfo-2023.11.04.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c +DIST cpuinfo-2024.10.22.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c diff --git a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild deleted file mode 100644 index 07d77a29af2f..000000000000 --- a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=8ec7bd91ad0470e61cf38f618cc1f270dede599c - -DESCRIPTION="CPU INFOrmation library" -HOMEPAGE="https://github.com/pytorch/cpuinfo/"; -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${PN}-2022.03.26-gentoo.patch -) - -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DCPUINFO_BUILD_BENCHMARKS=OFF - -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild deleted file mode 100644 index 3b0ec9465234..000000000000 --- a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=6481e8bef08f606ddd627e4d3be89f64d62e1b8a - -DESCRIPTION="CPU INFOrmation library" -HOMEPAGE="https://github.com/pytorch/cpuinfo/"; -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${PN}-2022.03.26-gentoo.patch - "${FILESDIR}"/${P}-test.patch -) - -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DCPUINFO_BUILD_BENCHMARKS=OFF - -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild b/dev-libs/cpuinfo/cpuinfo-2024.10.22.ebuild similarity index 64% rename from dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild rename to dev-libs/cpuinfo/cpuinfo-2024.10.22.ebuild index fc964a2ae125..768918495cbc 100644 --- a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild +++ b/dev-libs/cpuinfo/cpuinfo-2024.10.22.ebuild @@ -1,16 +1,18 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake -CommitId=b40bae27785787b6dd70788986fd96434cf90ae2 +CommitId=d6860c477c99f1fce9e28eb206891af3c0e1a1d7 DESCRIPTION="CPU INFOrmation library" HOMEPAGE="https://github.com/pytorch/cpuinfo/"; SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -19,20 +21,11 @@ IUSE="test" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2023.11.04-gentoo.patch + "${FILESDIR}"/${PN}-2023.01.13-test.patch ) -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - src_configure() { local mycmakeargs=( -DCPUINFO_BUILD_BENCHMARKS=OFF diff --git a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch b/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch deleted file mode 100644 index b7163d9e06e0..000000000000 --- a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt 2022-05-09 22:00:05.453640876 +0200 -+++ b/CMakeLists.txt 2022-05-09 22:01:11.621691380 +0200 -@@ -94,12 +94,6 @@ - - IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS) - IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLETEST_SOURCE_DIR) -- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") -- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") - SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory") - ENDIF() - ENDIF() -@@ -309,9 +303,6 @@ - IF(MSVC AND NOT CPUINFO_RUNTIME_TYPE STREQUAL "static") - SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - ENDIF() -- ADD_SUBDIRECTORY( -- "${GOOGLETEST_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest") - ENDIF() - ENDIF() - ENDIF()
