From 175b33c86167d6cde2f9fcd3b76195b2f9bdda9b Mon Sep 17 00:00:00 2001 From: andreili Date: Tue, 24 Oct 2023 12:07:31 +0200 Subject: [PATCH] Remove unneeded patches. Signed-off-by: andreili --- dev-cpp/abseil-cpp/Manifest | 3 +- .../abseil-cpp/abseil-cpp-20230802.0.ebuild | 12 ---- .../files/abseil-cpp-20230802.0.patch | 49 ------------- dev-libs/protobuf/Manifest | 3 +- dev-libs/protobuf/files/protobuf-v24.4.patch | 71 ------------------- dev-libs/protobuf/protobuf-24.4.ebuild | 6 +- profiles/arch.list | 1 + profiles/default/eapi | 1 + profiles/default/package.use.mask | 1 + profiles/use.local.desc | 1 + 10 files changed, 9 insertions(+), 139 deletions(-) delete mode 100644 dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0.patch delete mode 100644 dev-libs/protobuf/files/protobuf-v24.4.patch create mode 100644 profiles/arch.list create mode 100644 profiles/default/eapi create mode 100644 profiles/default/package.use.mask create mode 100644 profiles/use.local.desc diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 5c3cf30..86b239a 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,3 +1,2 @@ -AUX abseil-cpp-20230802.0.patch 1478 BLAKE2B 89cde5e46f8b26a798c13f03cb48cd5d13821144835e4eb6196443f464175bc494e6f6fba1f0e53543a05fbf5ea4abafb658e60a406374f12a932821145e1457 SHA512 4eafc3a137fb9fc71a8f15bed308f6a3544e367e44168a34a80148b1f17dda16f9c9b573dcf8bb6d801ee97c5c3dcb017379a4a671a54fb4c05b6cac26a4a4fb DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 -EBUILD abseil-cpp-20230802.0.ebuild 2110 BLAKE2B df05b048a65b50edfa12c22cf9f76b37bb60333d6f56846f79212ca1752e293228852cdcb089d0e3f48fba390fe628f37fb6373e1d2525e2e677d7b81600eda0 SHA512 4d33f250672bcd16ce168412ed3a7dcb85e2ee948dd01dc2b06c065e0fc2aa95ec4c66cd9cba67c0c3572f146bf5fbeaeba79b2cf47c8f97fd77e310245dff1b +EBUILD abseil-cpp-20230802.0.ebuild 1478 BLAKE2B 5d7c7cb2078e016feb12c325aab39696916a5587068bad7d9844b189d1f376a06e49de7e3dcc2d48bc4949d7f84f58db06f816b99aca973be889600179706857 SHA512 db8085b22c15ed93bc4913d8048e9a5729bb22f7e3a5ea5263a4aa94ca233a4c75e61167e56dcd04d83f926451e0f10af130a1cc59d14b3d51d6a94b20cf655e diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild index d955e86..b0f16e1 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild @@ -27,10 +27,6 @@ BDEPEND=" ) " -PATCHES=( - ${FILESDIR}/abseil-cpp-20230802.0.patch -) - RESTRICT="!test? ( test )" src_prepare() { @@ -43,14 +39,6 @@ src_prepare() { -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ absl/copts/copts.py || die - # Starting with abseil-2023xxyy abseil will start to delegate various absl:: types - # to their std:: equivalents by default when built with >=std=c++17. - # This older release still defaults to creating an absl/base/options.h file where this - # delegation is configured to happen at build time, creating ABI problems for consumers. - # In order to be consistent with future releases we therefore enforce the delegation to - # std::* implementations in this release as well. - sed -i -r -e 's/ABSL_OPTION_USE_STD_(.*) 2/ABSL_OPTION_USE_STD_\1 1/g' \ - absl/base/options.h || die # now generate cmake files python_fix_shebang absl/copts/generate_copts.py diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0.patch deleted file mode 100644 index 98d5fb3..0000000 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake -index f0d984ae..9134696d 100644 ---- a/CMake/AbseilDll.cmake -+++ b/CMake/AbseilDll.cmake -@@ -624,23 +624,33 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS - - include(CheckCXXSourceCompiles) - --check_cxx_source_compiles( -- [==[ --#ifdef _MSC_VER --# if _MSVC_LANG < 201700L --# error "The compiler defaults or is configured for C++ < 17" --# endif --#elif __cplusplus < 201700L --# error "The compiler defaults or is configured for C++ < 17" --#endif --int main() { return 0; } --]==] -+message(WARNING "ABSL_CXX_STANDARD: ${ABSL_CXX_STANDARD}") -+message(WARNING "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}") -+message(WARNING "CMAKE_CXX_STANDARD_REQUIRED: ${CMAKE_CXX_STANDARD_REQUIRED}") -+message(WARNING "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") -+ -+if(CMAKE_CXX_STANDARD GREATER_EQUAL 17) -+ set(ABSL_INTERNAL_AT_LEAST_CXX17 TRUE) -+else() -+ check_cxx_source_compiles( -+ [==[ -+ #ifdef _MSC_VER -+ # if _MSVC_LANG < 201700L -+ # error "The compiler defaults or is configured for C++ < 17" -+ # endif -+ #elif __cplusplus < 201700L -+ # error "The compiler defaults or is configured for C++ < 17" -+ #endif -+ int main() { return 0; } -+ ]==] - ABSL_INTERNAL_AT_LEAST_CXX17) -+endif() - - if(ABSL_INTERNAL_AT_LEAST_CXX17) - set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_17) - else() - set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_14) -+ message(FATAL_ERROR "Should not pass here !!!") - endif() - - function(absl_internal_dll_contains) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 01bee42..4cc6559 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,3 +1,2 @@ -AUX protobuf-v24.4.patch 2796 BLAKE2B f545535a428fbd81f606effb633bb7c70cdf1332324532e9c721174aec34c87cd780276e2efa11645395562c179292681d461eb21bdc7508bf1b217fb39ae8f8 SHA512 608fe40a35628ce93f4cfc204837a89668c582ac2ad43b3839c9e63c94daaa6aaac0c8bbbb4d64ac56848f1ea177e0d6d55921f999d87f4ddc483fa86d15337a DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463c79828c99dd8895a9549638c1ca17f9ab3b38d461019f3e1412d9cb9584b995b1da99866eb6fdbb8bdeb063e6f SHA512 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315 -EBUILD protobuf-24.4.ebuild 2443 BLAKE2B 9f4ad69a94546d9cde18ad6f1448e005e8789d6ace13777f91b1326184bcdd0edb33684d3fe72bb04133014f2a747233f4652ef51a14395429f6b89e480021ac SHA512 78ab823376a2c9e341eb63e770ac43956f931f645bfae79c61fe77d5fa3a421020abb2107745aa695370d8e6ea952cf0840ed03b9c7fe1f17719c25ba042a851 +EBUILD protobuf-24.4.ebuild 2446 BLAKE2B d3416e9fe637be0fce05618a8a9c9ed6c08bf6bd060bfcdab54f55be4c19c755e93bd3c8e70427fb5145e78ace7d5f768266689ed4dc08c828f59b86cb12d48a SHA512 458d2c7059e82f4f54e2bba04da69485a5ac89d0eb6befeaab0c3a76841fa1a63438181dde730d0d9472e0fa6d9e804afba3bf3bc0519d9262da4d4a9912bf4d diff --git a/dev-libs/protobuf/files/protobuf-v24.4.patch b/dev-libs/protobuf/files/protobuf-v24.4.patch deleted file mode 100644 index f22c617..0000000 --- a/dev-libs/protobuf/files/protobuf-v24.4.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac0d03c3a..ac8aee8a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ else (BUILD_SHARED_LIBS) - endif (BUILD_SHARED_LIBS) - option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHARED_LIBS_DEFAULT}) - include(CMakeDependentOption) --cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON -+cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" OFF - "NOT protobuf_BUILD_SHARED_LIBS" OFF) - set(protobuf_WITH_ZLIB_DEFAULT ON) - option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT}) -@@ -158,24 +158,16 @@ endif() - - set(_protobuf_FIND_ZLIB) - if (protobuf_WITH_ZLIB) -- find_package(ZLIB) -- if (ZLIB_FOUND) -- set(HAVE_ZLIB 1) -- # FindZLIB module define ZLIB_INCLUDE_DIRS variable -- # Set ZLIB_INCLUDE_DIRECTORIES for compatible -- set(ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS}) -- # Using imported target if exists -- if (TARGET ZLIB::ZLIB) -- set(ZLIB_LIBRARIES ZLIB::ZLIB) -- set(_protobuf_FIND_ZLIB "if(NOT ZLIB_FOUND)\n find_package(ZLIB)\nendif()") -- endif (TARGET ZLIB::ZLIB) -- else (ZLIB_FOUND) -- set(HAVE_ZLIB 0) -- # Explicitly set these to empty (override NOT_FOUND) so cmake doesn't -- # complain when we use them later. -- set(ZLIB_INCLUDE_DIRECTORIES) -- set(ZLIB_LIBRARIES) -- endif (ZLIB_FOUND) -+ if (NOT TARGET ZLIB::ZLIB) -+ find_package(ZLIB REQUIRED) -+ endif() -+ set(HAVE_ZLIB 1) -+ # FindZLIB module define ZLIB_INCLUDE_DIRS variable -+ # Set ZLIB_INCLUDE_DIRECTORIES for compatible -+ set(ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS}) -+ # Using imported target if exists -+ set(ZLIB_LIBRARIES ZLIB::ZLIB) -+ set(_protobuf_FIND_ZLIB "if(NOT ZLIB_FOUND AND NOT TARGET ZLIB::ZLIB)\n find_package(ZLIB REQUIRED)\nendif()") - endif (protobuf_WITH_ZLIB) - - # We need to link with libatomic on systems that do not have builtin atomics, or -@@ -277,7 +269,6 @@ else (MSVC) - endif (MSVC) - - include_directories( -- ${ZLIB_INCLUDE_DIRECTORIES} - ${protobuf_BINARY_DIR} - ${protobuf_SOURCE_DIR}/src) - -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index 422754a1a..ea91898d5 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -26,7 +26,9 @@ endif() - if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") - target_link_libraries(libprotobuf PRIVATE log) - endif() --target_include_directories(libprotobuf PUBLIC ${protobuf_SOURCE_DIR}/src) -+target_include_directories(libprotobuf PUBLIC -+ ${protobuf_SOURCE_DIR}/src -+ ${protobuf_SOURCE_DIR}) - target_link_libraries(libprotobuf PUBLIC ${protobuf_ABSL_USED_TARGETS}) - protobuf_configure_target(libprotobuf) - if(protobuf_BUILD_SHARED_LIBS) diff --git a/dev-libs/protobuf/protobuf-24.4.ebuild b/dev-libs/protobuf/protobuf-24.4.ebuild index 25abba7..85e62db 100644 --- a/dev-libs/protobuf/protobuf-24.4.ebuild +++ b/dev-libs/protobuf/protobuf-24.4.ebuild @@ -35,9 +35,9 @@ RDEPEND=" zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) " -PATCHES=( - ${FILESDIR}/protobuf-v24.4.patch -) +#PATCHES=( +# ${FILESDIR}/protobuf-v24.4.patch +#) DOCS=( CONTRIBUTORS.txt README.md ) diff --git a/profiles/arch.list b/profiles/arch.list new file mode 100644 index 0000000..21d5bd8 --- /dev/null +++ b/profiles/arch.list @@ -0,0 +1 @@ +amd64 diff --git a/profiles/default/eapi b/profiles/default/eapi new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/profiles/default/eapi @@ -0,0 +1 @@ +8 diff --git a/profiles/default/package.use.mask b/profiles/default/package.use.mask new file mode 100644 index 0000000..c83343c --- /dev/null +++ b/profiles/default/package.use.mask @@ -0,0 +1 @@ +sci-electronics/xyce -cuda diff --git a/profiles/use.local.desc b/profiles/use.local.desc new file mode 100644 index 0000000..b086e94 --- /dev/null +++ b/profiles/use.local.desc @@ -0,0 +1 @@ +sci-electronics/xyce:cuda - Enable CUDA parallelism