Mercurial > mxe-octave
annotate src/glpk-1-fixes.patch @ 7223:09b1697eff3a default tip @
* src/qtbase.mk, src/qtimageformats.mk,
src/qtsvg.mk, src/qttools.mk,
src/qttranslations.mk: update to v5.15.14
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 26 May 2024 20:23:00 -0400 |
| parents | a61bbe1a4b72 |
| children |
| rev | line source |
|---|---|
| 4960 | 1 diff -ur glpk-4.65.orig/configure.ac glpk-4.65/configure.ac |
| 2 --- glpk-4.65.orig/configure.ac 2019-02-20 14:31:36.960931258 -0500 | |
| 3 +++ glpk-4.65/configure.ac 2019-02-20 14:36:12.463581439 -0500 | |
| 4 @@ -190,6 +190,14 @@ | |
| 5 esac | |
| 6 AC_SUBST([NOUNDEFINED]) | |
| 7 | |
| 8 +AC_CHECK_LIB([z], [gzopen]) | |
| 9 + | |
| 10 +AC_CHECK_LIB([amd], [amd_1]) | |
| 11 +AC_CHECK_LIB([colamd], [colamd]) | |
| 12 + | |
|
7018
a61bbe1a4b72
SuiteSparse: update to 7.4.0
Markus Mützel <markus.muetzel@gmx.de>
parents:
6873
diff
changeset
|
13 +CPPFLAGS="$CPPFLAGS $(pkg-config --cflags AMD)" |
|
a61bbe1a4b72
SuiteSparse: update to 7.4.0
Markus Mützel <markus.muetzel@gmx.de>
parents:
6873
diff
changeset
|
14 +AC_CHECK_HEADER([amd.h]) |
| 4960 | 15 + |
| 16 AC_CONFIG_FILES( | |
| 17 [src/Makefile examples/Makefile Makefile]) | |
| 18 AC_OUTPUT | |
| 19 diff -ur glpk-4.65.orig/src/Makefile.am glpk-4.65/src/Makefile.am | |
| 20 --- glpk-4.65.orig/src/Makefile.am 2019-02-20 14:31:36.988931934 -0500 | |
| 21 +++ glpk-4.65/src/Makefile.am 2019-02-20 14:37:43.921787648 -0500 | |
| 22 @@ -6,10 +6,8 @@ | |
| 23 | |
| 24 libglpk_la_CPPFLAGS = \ | |
| 25 -I$(srcdir) \ | |
| 26 --I$(srcdir)/amd \ | |
| 27 -I$(srcdir)/api \ | |
| 28 -I$(srcdir)/bflib \ | |
| 29 --I$(srcdir)/colamd \ | |
| 30 -I$(srcdir)/draft \ | |
| 31 -I$(srcdir)/env \ | |
| 32 -I$(srcdir)/intopt \ | |
| 33 @@ -18,8 +16,7 @@ | |
| 34 -I$(srcdir)/mpl \ | |
| 35 -I$(srcdir)/npp \ | |
| 36 -I$(srcdir)/proxy \ | |
| 37 --I$(srcdir)/simplex \ | |
| 38 --I$(srcdir)/zlib | |
| 39 +-I$(srcdir)/simplex | |
| 40 | |
| 41 libglpk_la_LDFLAGS = \ | |
| 42 -version-info 43:0:3 \ | |
| 43 @@ -27,18 +24,6 @@ | |
| 44 ${NOUNDEFINED} | |
| 45 | |
| 46 libglpk_la_SOURCES = \ | |
| 47 -amd/amd_1.c \ | |
| 48 -amd/amd_2.c \ | |
| 49 -amd/amd_aat.c \ | |
| 50 -amd/amd_control.c \ | |
| 51 -amd/amd_defaults.c \ | |
| 52 -amd/amd_dump.c \ | |
| 53 -amd/amd_info.c \ | |
| 54 -amd/amd_order.c \ | |
| 55 -amd/amd_post_tree.c \ | |
| 56 -amd/amd_postorder.c \ | |
| 57 -amd/amd_preprocess.c \ | |
| 58 -amd/amd_valid.c \ | |
| 59 api/advbas.c \ | |
| 60 api/asnhall.c \ | |
| 61 api/asnlp.c \ | |
| 62 @@ -104,7 +89,6 @@ | |
| 63 bflib/scfint.c \ | |
| 64 bflib/sgf.c \ | |
| 65 bflib/sva.c \ | |
| 66 -colamd/colamd.c \ | |
| 67 draft/bfd.c \ | |
| 68 draft/bfx.c \ | |
| 69 draft/glpapi06.c \ | |
| 70 @@ -202,21 +186,6 @@ | |
| 71 simplex/spxprob.c \ | |
| 72 simplex/spychuzc.c \ | |
| 73 simplex/spychuzr.c \ | |
| 74 -simplex/spydual.c \ | |
| 75 -zlib/adler32.c \ | |
| 76 -zlib/compress.c \ | |
| 77 -zlib/crc32.c \ | |
| 78 -zlib/deflate.c \ | |
| 79 -zlib/gzclose.c \ | |
| 80 -zlib/gzlib.c \ | |
| 81 -zlib/gzread.c \ | |
| 82 -zlib/gzwrite.c \ | |
| 83 -zlib/inffast.c \ | |
| 84 -zlib/inflate.c \ | |
| 85 -zlib/inftrees.c \ | |
| 86 -zlib/trees.c \ | |
| 87 -zlib/uncompr.c \ | |
| 88 -zlib/zio.c \ | |
| 89 -zlib/zutil.c | |
| 90 +simplex/spydual.c | |
| 91 | |
| 92 ## eof ## | |
| 93 diff -ur glpk-4.65.orig/src/env/stdc.c glpk-4.65/src/env/stdc.c | |
| 94 --- glpk-4.65.orig/src/env/stdc.c 2019-02-20 15:29:18.821040444 -0500 | |
| 95 +++ glpk-4.65/src/env/stdc.c 2019-02-20 15:40:06.948676811 -0500 | |
| 96 @@ -49,7 +49,7 @@ | |
| 97 | |
| 98 /* MS Windows version *************************************************/ | |
| 99 | |
| 100 -#elif defined(__WOE__) | |
| 101 +#elif defined(__WOE__) || defined(_WIN32) | |
| 102 | |
| 103 #include "stdc.h" | |
| 104 | |
| 105 Only in glpk-4.65/src/env: .time.c.swp |