# HG changeset patch
# User John Donoghue
# Date 1550775406 18000
# Node ID 3df44260321f7e0978200d8268931c41a282ded3
# Parent  506a61f959e4f78b66c5ce48c2238cf85b60ca32
glpk: update to 4.65

* src/glpk-1-fixes.patch: new patch

* src/glpk.mk: update version, checksum

diff -r 506a61f959e4 -r 3df44260321f src/glpk-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glpk-1-fixes.patch	Thu Feb 21 13:56:46 2019 -0500
@@ -0,0 +1,119 @@
+diff -ur glpk-4.65.orig/configure.ac glpk-4.65/configure.ac
+--- glpk-4.65.orig/configure.ac	2019-02-20 14:31:36.960931258 -0500
++++ glpk-4.65/configure.ac	2019-02-20 14:36:12.463581439 -0500
+@@ -190,6 +190,14 @@
+ esac
+ AC_SUBST([NOUNDEFINED])
+ 
++AC_CHECK_LIB([z], [gzopen])
++
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++
++#CPPFLAGS="$CPPFLAGS -I/usr/include/suitesparse"
++AC_CHECK_HEADER([suitesparse/amd.h])
++
+ AC_CONFIG_FILES(
+    [src/Makefile examples/Makefile Makefile])
+ AC_OUTPUT
+diff -ur glpk-4.65.orig/src/Makefile.am glpk-4.65/src/Makefile.am
+--- glpk-4.65.orig/src/Makefile.am	2019-02-20 14:31:36.988931934 -0500
++++ glpk-4.65/src/Makefile.am	2019-02-20 14:37:43.921787648 -0500
+@@ -6,10 +6,8 @@
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/draft \
+ -I$(srcdir)/env \
+ -I$(srcdir)/intopt \
+@@ -18,8 +16,7 @@
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/npp \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+ 
+ libglpk_la_LDFLAGS = \
+ -version-info 43:0:3 \
+@@ -27,18 +24,6 @@
+ ${NOUNDEFINED}
+ 
+ libglpk_la_SOURCES = \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ api/advbas.c \
+ api/asnhall.c \
+ api/asnlp.c \
+@@ -104,7 +89,6 @@
+ bflib/scfint.c \
+ bflib/sgf.c \
+ bflib/sva.c \
+-colamd/colamd.c \
+ draft/bfd.c \
+ draft/bfx.c \
+ draft/glpapi06.c \
+@@ -202,21 +186,6 @@
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++simplex/spydual.c
+ 
+ ## eof ##
+diff -ur glpk-4.65.orig/src/draft/glpmat.c glpk-4.65/src/draft/glpmat.c
+--- glpk-4.65.orig/src/draft/glpmat.c	2019-02-20 15:21:37.117944413 -0500
++++ glpk-4.65/src/draft/glpmat.c	2019-02-20 15:22:58.407893375 -0500
+@@ -25,8 +25,8 @@
+ #include "env.h"
+ #include "glpmat.h"
+ #include "qmd.h"
+-#include "amd.h"
+-#include "colamd.h"
++#include <suitesparse/amd.h>
++#include <suitesparse/colamd.h>
+ 
+ /*----------------------------------------------------------------------
+ -- check_fvs - check sparse vector in full-vector storage format.
+diff -ur glpk-4.65.orig/src/env/stdc.c glpk-4.65/src/env/stdc.c
+--- glpk-4.65.orig/src/env/stdc.c	2019-02-20 15:29:18.821040444 -0500
++++ glpk-4.65/src/env/stdc.c	2019-02-20 15:40:06.948676811 -0500
+@@ -49,7 +49,7 @@
+ 
+ /* MS Windows version *************************************************/
+ 
+-#elif defined(__WOE__)
++#elif defined(__WOE__) || defined(_WIN32)
+ 
+ #include "stdc.h"
+ 
+Only in glpk-4.65/src/env: .time.c.swp
diff -r 506a61f959e4 -r 3df44260321f src/glpk.mk
--- a/src/glpk.mk	Sat Feb 16 16:03:02 2019 +0100
+++ b/src/glpk.mk	Thu Feb 21 13:56:46 2019 -0500
@@ -3,12 +3,12 @@
 
 PKG             := glpk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.60
-$(PKG)_CHECKSUM := 4e55a3d2aa38b19c5bdd8a195738dbaf44e91e90
+$(PKG)_VERSION  := 4.65
+$(PKG)_CHECKSUM := d9b607a9cf3a25b754a0cd9a842ea5043f8604db
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := glpk-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/glpk/$($(PKG)_FILE)
-$(PKG)_DEPS     := gmp
+$(PKG)_DEPS     := gmp suitesparse
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/glpk/?C=M;O=D' | \
@@ -18,6 +18,7 @@
 
 define $(PKG)_BUILD
     mkdir '$(1)/.build'
+    cd '$(1)' && autoreconf -fi -I m4
     cd '$(1)/.build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \