Mercurial > mxe-octave
view src/suitesparse-2-metis.patch @ 6548:8eeafbe25137
* src/mpfr.mk: update to v4.1.1
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 28 Nov 2022 14:27:27 -0500 |
parents | af2966900462 |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 20 Nov 2017 22:54:25 +1100 Subject: [PATCH 1/3] mingw-w64-does-not-have-sys-resource-h taken from: https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0001-mingw-w64-does-not-have-sys-resource-h.patch diff --git a/metis-5.1.0/GKlib/gk_arch.h b/metis-5.1.0/GKlib/gk_arch.h index 1111111..2222222 100644 --- a/metis-5.1.0/GKlib/gk_arch.h +++ b/metis-5.1.0/GKlib/gk_arch.h @@ -41,7 +41,9 @@ #endif #include <inttypes.h> #include <sys/types.h> - #include <sys/resource.h> + #ifndef __MINGW32__ + #include <sys/resource.h> + #endif #include <sys/time.h> #endif From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 20 Nov 2017 22:55:34 +1100 Subject: [PATCH 2/3] mingw-w64-do-not-use-reserved-double-underscored-names taken from: https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0002-mingw-w64-do-not-use-reserved-double-underscored-names.patch diff --git a/metis-5.1.0/GKlib/gk_getopt.h b/metis-5.1.0/GKlib/gk_getopt.h index 1111111..2222222 100644 --- a/metis-5.1.0/GKlib/gk_getopt.h +++ b/metis-5.1.0/GKlib/gk_getopt.h @@ -52,10 +52,10 @@ struct gk_option { /* Function prototypes */ -extern int gk_getopt(int __argc, char **__argv, char *__shortopts); -extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts, +extern int gk_getopt(int gk_argc, char **gk_argv, char *__shortopts); +extern int gk_getopt_long(int gk_argc, char **gk_argv, char *__shortopts, struct gk_option *__longopts, int *__longind); -extern int gk_getopt_long_only (int __argc, char **__argv, +extern int gk_getopt_long_only (int gk_argc, char **gk_argv, char *__shortopts, struct gk_option *__longopts, int *__longind); From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 20 Nov 2017 22:58:20 +1100 Subject: [PATCH 3/3] WIN32-Install-RUNTIME-to-bin taken from: https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0003-WIN32-Install-RUNTIME-to-bin.patch diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt index 1111111..2222222 100644 --- a/metis-5.1.0/libmetis/CMakeLists.txt +++ b/metis-5.1.0/libmetis/CMakeLists.txt @@ -8,9 +8,15 @@ if(UNIX) target_link_libraries(metis m) endif() +if(WIN32) + set(RT_DEST bin) +else() + set(RT_DEST lib) +endif() + if(METIS_INSTALL) install(TARGETS metis LIBRARY DESTINATION lib - RUNTIME DESTINATION lib + RUNTIME DESTINATION ${RT_DEST} ARCHIVE DESTINATION lib) endif()