[rpms/cp2k] rawhide: Drop march and mtune flags

[rpms/cp2k] rawhide: Drop march and mtune flags

[Cristian Le]

A new commit has been pushed.

Repo   : rpms/cp2k
Branch : rawhide
Commit : 965e963c4e01b5760b9c6e15e6c85ae3194b7de1
Author : Cristian Le <git@lecris.dev>
Date   : 2026-07-21T17:05:03+02:00
Stats  : +29/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/cp2k/c/965e963c4e01b5760b9c6e15e6c85ae3194b7de1?branch=rawhide

Log:
Drop march and mtune flags

---
diff --git a/cp2k.spec b/cp2k.spec
index 5547dd2..155fe04 100644
--- a/cp2k.spec
+++ b/cp2k.spec
@@ -12,6 +12,10 @@ License:       GPL-2.0-or-later
 URL:           https://www.cp2k.org/
 Source0:       https://github.com/cp2k/cp2k/releases/download/v%{version}/cp2k-%{version}.tar.bz2
 
+# Drop march and mtune flags
+# TODO: Use the options exposed in upstream https://github.com/cp2k/cp2k/pull/5602
+Patch:         drop-native.patch
+
 # Drop 32bit architectures
 # Flaky MPI issues on s390x, and upstream do not officially support it yet
 # https://github.com/cp2k/cp2k/issues/3362

diff --git a/drop-native.patch b/drop-native.patch
new file mode 100644
index 0000000..0a3b9e9
--- /dev/null
+++ b/drop-native.patch
@@ -0,0 +1,25 @@
+diff -ru cp2k-2026.2/cmake/CompilerConfiguration.cmake cp2k-2026.2-new/cmake/CompilerConfiguration.cmake
+--- cp2k-2026.2/cmake/CompilerConfiguration.cmake	2026-07-13 16:41:47.815335500 +0200
++++ cp2k-2026.2-new/cmake/CompilerConfiguration.cmake	2026-07-21 17:00:07.316885414 +0200
+@@ -52,7 +52,7 @@
+ 
+ # -- Apple Silicon + GCC: -march=native expands internally to -march=apple-m1
+ # (invalid). Use -mcpu=native instead.
+-set(_CP2K_GNU_NATIVE_TUNE "-march=native;-mtune=native")
++set(_CP2K_GNU_NATIVE_TUNE "")
+ if(APPLE
+    AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+    AND (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU"
+@@ -76,9 +76,9 @@
+ 
+ # Generic
+ add_compile_options(
+-  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:Fortran,GNU>>:-O3;-mtune=generic;-funroll-loops>"
+-  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:CXX,GNU>>:-O3;-mtune=generic;-funroll-loops>"
+-  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:C,GNU>>:-O3;-mtune=generic;-funroll-loops>"
++  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:Fortran,GNU>>:-O3;-funroll-loops>"
++  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:CXX,GNU>>:-O3;-funroll-loops>"
++  "$<$<AND:$<CONFIG:GENERIC>,$<COMPILE_LANG_AND_ID:C,GNU>>:-O3;-funroll-loops>"
+ )
+ 
+ # Debug