Mercurial > mxe-octave

annotate src/suitesparse-2-metis.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents af2966900462
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5186
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 This file is part of MXE.
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 See index.html for further information.
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 From: Tony Theodore <tonyt@logyst.com>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 Date: Mon, 20 Nov 2017 22:54:25 +1100
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 Subject: [PATCH 1/3] mingw-w64-does-not-have-sys-resource-h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 taken from:
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0001-mingw-w64-does-not-have-sys-resource-h.patch
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 diff --git a/metis-5.1.0/GKlib/gk_arch.h b/metis-5.1.0/GKlib/gk_arch.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 index 1111111..2222222 100644
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 --- a/metis-5.1.0/GKlib/gk_arch.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 +++ b/metis-5.1.0/GKlib/gk_arch.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 @@ -41,7 +41,9 @@
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 #endif
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 #include <inttypes.h>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 #include <sys/types.h>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 - #include <sys/resource.h>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 + #ifndef __MINGW32__
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 + #include <sys/resource.h>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 + #endif
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 #include <sys/time.h>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 #endif
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 From: Tony Theodore <tonyt@logyst.com>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 Date: Mon, 20 Nov 2017 22:55:34 +1100
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 Subject: [PATCH 2/3] mingw-w64-do-not-use-reserved-double-underscored-names
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 taken from:
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0002-mingw-w64-do-not-use-reserved-double-underscored-names.patch
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 diff --git a/metis-5.1.0/GKlib/gk_getopt.h b/metis-5.1.0/GKlib/gk_getopt.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 index 1111111..2222222 100644
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 --- a/metis-5.1.0/GKlib/gk_getopt.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 +++ b/metis-5.1.0/GKlib/gk_getopt.h
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 @@ -52,10 +52,10 @@ struct gk_option {
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 /* Function prototypes */
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 -extern int gk_getopt(int __argc, char **__argv, char *__shortopts);
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 -extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts,
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 +extern int gk_getopt(int gk_argc, char **gk_argv, char *__shortopts);
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 +extern int gk_getopt_long(int gk_argc, char **gk_argv, char *__shortopts,
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 struct gk_option *__longopts, int *__longind);
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 -extern int gk_getopt_long_only (int __argc, char **__argv,
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 +extern int gk_getopt_long_only (int gk_argc, char **gk_argv,
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 char *__shortopts, struct gk_option *__longopts, int *__longind);
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 From: Tony Theodore <tonyt@logyst.com>
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 Date: Mon, 20 Nov 2017 22:58:20 +1100
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 Subject: [PATCH 3/3] WIN32-Install-RUNTIME-to-bin
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 taken from:
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0003-WIN32-Install-RUNTIME-to-bin.patch
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65 index 1111111..2222222 100644
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66 --- a/metis-5.1.0/libmetis/CMakeLists.txt
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
67 +++ b/metis-5.1.0/libmetis/CMakeLists.txt
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
68 @@ -8,9 +8,15 @@ if(UNIX)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
69 target_link_libraries(metis m)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
70 endif()
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
71
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
72 +if(WIN32)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
73 + set(RT_DEST bin)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
74 +else()
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
75 + set(RT_DEST lib)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
76 +endif()
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
77 +
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
78 if(METIS_INSTALL)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
79 install(TARGETS metis
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
80 LIBRARY DESTINATION lib
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
81 - RUNTIME DESTINATION lib
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
82 + RUNTIME DESTINATION ${RT_DEST}
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
83 ARCHIVE DESTINATION lib)
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
84 endif()
af2966900462 suitesparse: update to v4.5.6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
85