scotch: Update to 7.0.7

+ gcc15 fixes
This commit is contained in:
Christoph Reiter 2025-06-01 10:56:12 +02:00
parent 5eb384658d
commit d9352ba6c7
2 changed files with 35 additions and 5 deletions

View File

@ -0,0 +1,28 @@
https://gitlab.inria.fr/scotch/scotch/-/issues/48
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c84b7b..46e5fcd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,7 @@ endif()
# Detect and remove GCC _FORTIFY_SOURCE
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS} -E -Og -dM -x c ${dev_null} OUTPUT_VARIABLE gcc_macros)
- string(FIND ${gcc_macros} "_FORTIFY_SOURCE" fortify)
+ string(FIND "${gcc_macros}" "_FORTIFY_SOURCE" fortify)
if(fortify GREATER -1)
message(WARNING "GCC _FORTIFY_SOURCE is known to cause problem with Scotch and has been disabled")
set(CMAKE_C_FLAGS "-U_FORTIFY_SOURCE ${CMAKE_C_FLAGS}")
diff --git a/src/scotch/amk_m2.h b/src/scotch/amk_m2.h
index 9349cb8..b170b46 100644
--- a/src/scotch/amk_m2.h
+++ b/src/scotch/amk_m2.h
@@ -91,7 +91,7 @@ typedef int (* DomnBipartFunc) (const ArchMesh2 * const, const ArchMesh2Dom * co
** The function prototypes.
*/
-void C_domnBipart (ArchMesh2 *, ArchMesh2Dom *, Anum, Anum *, Anum *, int (*) ());
+void C_domnBipart (ArchMesh2 *, ArchMesh2Dom *, Anum, Anum *, Anum *, DomnBipartFunc);
int C_domnBipartOne (const ArchMesh2 * const, const ArchMesh2Dom * const, ArchMesh2Dom * restrict const, ArchMesh2Dom * restrict const);
/*

View File

@ -5,8 +5,8 @@ pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-int64")
pkgdesc='Graph partitioning and sparse matrix ordering package (mingw-w64)'
pkgver=7.0.6
pkgrel=2
pkgver=7.0.7
pkgrel=1
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
url="https://www.labri.fr/perso/pelegrin/scotch/"
@ -22,12 +22,14 @@ source=("https://gitlab.inria.fr/scotch/scotch/-/archive/v${pkgver}/${_realname}
"Makefile.idx32.inc"
"Makefile.idx64.inc"
"0002-pipe-fix.patch"
"0004-dummysizes-regex.patch")
sha256sums=('b44acd0d2f53de4b578fa3a88944cccc45c4d2961cd8cefa9b9a1d5431de8e2b'
"0004-dummysizes-regex.patch"
"0005-gcc15.patch")
sha256sums=('02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5'
'4221b69dcc53230ff4d6bc18e3982f6d39971a99fc17f4dab609fc19b99d8a30'
'c52bf0598332d8139a37606e7ea9376b7f841059047c0c977b205a763fc7e97a'
'b6e76b1d2f35b3fcc771b97a35a468d6314ee3a619defef18b82fc7654638a49'
'15dd82d4c7b118e08316df4242d647bdaa1f180ff143ee33fe84633c97aac111')
'15dd82d4c7b118e08316df4242d647bdaa1f180ff143ee33fe84633c97aac111'
'5e9f80eccaca1619ffa279c544c9601731748d852c02f1873b0556bebf625804')
prepare() {
cd "${srcdir}/${_realname}-v${pkgver}"