gentoo auto-resync : 09:07:2023 - 10:24:32

3 files changed, 72 insertions, 1 deletions

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 4858e8729079..5968fddbe7fe 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,7 +1,8 @@
+AUX flint-2.9.0-remove-hardcoded-CFLAGS.patch 2131 BLAKE2B f52fbcf321fd0f0beb302480c220b1f83e382ffe893e9b22a5eed839d02c2436ba101575c272cea0fbcbdd42110d5b9dde7cf6516403cb6dde1b0fa081dae63f SHA512 fa5c057cf664cd3ba83d3ec6b31a96c8a8e4a971a8f07b11a40150e22c1e55c7ad2d8b480f119213f867e502417c48741bb438b1724393b42da27d3577116fb5
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
 DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
 DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
 EBUILD flint-2.8.4.ebuild 1528 BLAKE2B 349b7cdc5033da4096b18ff8066fcd036a5f88a8f037f4bdea02128954f03885ee70b1ae71dd3cf027c7b7aecdffb72cbbfa0196c6eb2ac0df63dea0d8ab1756 SHA512 56b3b39d5508f5ca577d8b56a89977a3f7487cc3c6e6d6f94ee236c1b4457e5c46896eeb24b39c40603a639837817cb15c46218fbabee0cd81dd3d3584fa41b3
 EBUILD flint-2.8.5.ebuild 1646 BLAKE2B bd2043190463fab0c3e6618d7910630a582f4ba0df984b6555efa28816ed9994ef4d9bd574bea6a00b29a071ff3a21443e83f46224cc8a87c2d7d710a9553260 SHA512 8dbbe5d46cd1167cd524cd231a952b137a324881e397c60fe02d057b4bfc680e7e729888c45b0457ae9b685c629e92b1591aa345f82ac7f6d2b94110db77c197
-EBUILD flint-2.9.0.ebuild 1659 BLAKE2B 31dbe52bf90087158ab0c429305e463d34d6a3e7c05d41bfd68aa7c1b666a71d7a067d7584fcedf6fc6e18b9d7e4f466c0f3205f0897528cbe864b7a0ddefc61 SHA512 1f4b21e9fedbb1cb3488f792179275613983a73db47e4b6bd084d0c8b65646e145caa5e00becb44b4555d2087ad762fe6db3ea25259a993c15eab2e616786e60
+EBUILD flint-2.9.0.ebuild 1727 BLAKE2B 6939827103566aa3a9a1d806f474b9f0734b486324a176b076db7b63145376f9d5e029874b17f229da9ed7f74738e575145d320a7f83b12a56c5092e34f848a3 SHA512 45c2257823d384a0bf178dce2767161caf0664cc28515030dbd01a51bc4c9d672c294a0cd100aafb0aa51a7427c1d9a257d20b767b9b707a0d68e75fe0b5138c
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
new file mode 100644
index 000000000000..b057ea207bbd
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
@@ -0,0 +1,69 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9784633c4..641ab9ed4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ cmake_minimum_required(VERSION 3.9)
+ 
+-include(CheckIPOSupported)
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckPrototypeDefinition)
+@@ -126,13 +125,6 @@ with open(join('${CMAKE_SOURCE_DIR}','qadic', 'CPimport.txt')) as fin:
+ )
+ configure_file(${CMAKE_BINARY_DIR}/CPimport.h.in ${CMAKE_BINARY_DIR}/CPimport.h COPYONLY)
+ 
+-# Setup for flint-config.h
+-check_c_compiler_flag("-mpopcnt" HAS_FLAG_MPOPCNT)
+-check_c_compiler_flag("-funroll-loops" HAS_FLAG_UNROLL_LOOPS)
+-
+-if(HAS_FLAG_MPOPCNT)
+-  set(CMAKE_REQUIRED_FLAGS "-mpopcnt")
+-endif()
+ # Testing __builtin_popcountl...
+ check_c_source_runs([[int main(int argc, char ** argv) {
+   #if defined(_WIN64)
+@@ -141,7 +133,6 @@ check_c_source_runs([[int main(int argc, char ** argv) {
+   return __builtin_popcountl(argc) == 100;
+   #endif
+   }]] FLINT_USES_POPCNT)
+-unset(CMAKE_REQUIRED_FLAGS)
+ 
+ # fenv configuration
+ check_c_source_compiles([[#include <fenv.h>
+@@ -250,13 +241,6 @@ if(BUILD_SHARED_LIBS AND WIN32)
+     target_compile_definitions(flint PUBLIC "MSC_USE_DLL")
+ endif()
+ 
+-if (HAS_FLAG_MPOPCNT)
+-    target_compile_options(flint PUBLIC "-mpopcnt")
+-endif()
+-if (HAS_FLAG_UNROLL_LOOPS)
+-    target_compile_options(flint PUBLIC "-funroll-loops")
+-endif()
+-
+ # Versioning
+ 
+ set_target_properties(flint PROPERTIES
+@@ -279,21 +263,6 @@ elseif (WIN32)
+     set_target_properties(flint PROPERTIES RUNTIME_OUTPUT_NAME "flint-${FLINT_MAJOR}")
+ endif()
+ 
+-if(NOT DEFINED IPO_SUPPORTED)
+-    message(STATUS "Checking for IPO")
+-    check_ipo_supported(RESULT ipo_supported LANGUAGES C)
+-    if(ipo_supported)
+-        message(STATUS "Checking for IPO - found")
+-    else()
+-        message(STATUS "Checking for IPO - not found")
+-    endif()
+-    set(IPO_SUPPORTED ${ipo_supported} CACHE INTERNAL "Introprocedural Optimization" FORCE)
+-endif()
+-
+-if(IPO_SUPPORTED)
+-    set_target_properties(flint PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
+-endif()
+-
+ if(NOT MSVC)
+ 	target_link_libraries(flint PUBLIC m)
+ endif()
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
index 5a1fb677b0b8..494339dd488e 100644
--- a/sci-mathematics/flint/flint-2.9.0.ebuild
+++ b/sci-mathematics/flint/flint-2.9.0.ebuild
@@ -41,6 +41,7 @@ DEPEND="dev-libs/gmp:=
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/flint2-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.9.0-remove-hardcoded-CFLAGS.patch" )
 
 src_prepare() {
 	# https://github.com/wbhart/flint2/issues/1140