Changeset 788


Ignore:
Timestamp:
Nov 24, 2007 9:19:31 AM (14 years ago)
Author:
stefan
Message:

update to glpk 4.24
add patch to get correct status code if terminated because the gap is closed

Location:
ThirdParty/Glpk/trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Glpk/trunk/INSTALL.Glpk

    r736 r788  
    1414You may download
    1515
    16 ftp://ftp.gnu.org/gnu/glpk/glpk-4.23.tar.gz
     16ftp://ftp.gnu.org/gnu/glpk/glpk-4.24.tar.gz
    1717
    1818and unpack it in this directory:
    1919
    20 gunzip glpk-4.23.tar.gz
    21 tar xf glpk-4.23.tar
     20gunzip glpk-4.24.tar.gz
     21tar xf glpk-4.24.tar
    2222
    23 Finally you need to rename the directory
    24   glpk-4.23
     23Then you need to rename the directory
     24  glpk-4.24
    2525into
    2626  glpk
    2727.
     28
     29Finally you apply a small patch file
     30  patch -p0 < glpk.patch
     31.

  • ThirdParty/Glpk/trunk/Makefile.am

    r735 r788  
    4141$(GLPKDIR)/src/glpios03.c \
    4242$(GLPKDIR)/src/glpios04.c \
     43$(GLPKDIR)/src/glpios05.c \
    4344$(GLPKDIR)/src/glpipm.c \
    4445$(GLPKDIR)/src/glpipp01.c \

  • ThirdParty/Glpk/trunk/Makefile.in

    r735 r788  
    7777        glpapi09.lo glpapi10.lo glpapi11.lo glpapi12.lo glpavl.lo \
    7878        glpbfd.lo glpbfx.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo \
    79         glpios01.lo glpios02.lo glpios03.lo glpios04.lo glpipm.lo \
    80         glpipp01.lo glpipp02.lo glplib01.lo glplib02.lo glplib03.lo \
    81         glplib04.lo glplib05.lo glplib06.lo glplib07.lo glplib08.lo \
    82         glplib09.lo glplpf.lo glplpp01.lo glplpp02.lo glplpx01.lo \
    83         glplpx02.lo glplpx03.lo glplpx04.lo glplpx05.lo glplpx06.lo \
    84         glplpx07.lo glplpx08.lo glplpx09.lo glplpx10.lo glplpx11.lo \
    85         glplpx12.lo glplpx13.lo glplpx14.lo glplpx15.lo glplpx16.lo \
    86         glplpx17.lo glplpx18.lo glplpx19.lo glplpx20.lo glpluf.lo \
    87         glplux.lo glpmat.lo glpmpl01.lo glpmpl02.lo glpmpl03.lo \
    88         glpmpl04.lo glppds.lo glpqmd.lo glprng01.lo glprng02.lo \
    89         glpscf.lo glpscg.lo glpscs.lo glpspx01.lo glpspx02.lo \
    90         glpssx01.lo glpssx02.lo
     79        glpios01.lo glpios02.lo glpios03.lo glpios04.lo glpios05.lo \
     80        glpipm.lo glpipp01.lo glpipp02.lo glplib01.lo glplib02.lo \
     81        glplib03.lo glplib04.lo glplib05.lo glplib06.lo glplib07.lo \
     82        glplib08.lo glplib09.lo glplpf.lo glplpp01.lo glplpp02.lo \
     83        glplpx01.lo glplpx02.lo glplpx03.lo glplpx04.lo glplpx05.lo \
     84        glplpx06.lo glplpx07.lo glplpx08.lo glplpx09.lo glplpx10.lo \
     85        glplpx11.lo glplpx12.lo glplpx13.lo glplpx14.lo glplpx15.lo \
     86        glplpx16.lo glplpx17.lo glplpx18.lo glplpx19.lo glplpx20.lo \
     87        glpluf.lo glplux.lo glpmat.lo glpmpl01.lo glpmpl02.lo \
     88        glpmpl03.lo glpmpl04.lo glppds.lo glpqmd.lo glprng01.lo \
     89        glprng02.lo glpscf.lo glpscg.lo glpscs.lo glpspx01.lo \
     90        glpspx02.lo glpssx01.lo glpssx02.lo
    9191libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
    9292@COIN_BUILD_GLPK_TRUE@am_libcoinglpk_la_rpath =
    … …  
    278278$(GLPKDIR)/src/glpios03.c \
    279279$(GLPKDIR)/src/glpios04.c \
     280$(GLPKDIR)/src/glpios05.c \
    280281$(GLPKDIR)/src/glpipm.c \
    281282$(GLPKDIR)/src/glpipp01.c \
    … …  
    437438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios03.Plo@am__quote@
    438439@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios04.Plo@am__quote@
     440@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios05.Plo@am__quote@
    439441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipm.Plo@am__quote@
    440442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipp01.Plo@am__quote@
    … …  
    672674@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    673675@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios04.lo `test -f '$(GLPKDIR)/src/glpios04.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios04.c
     676
     677glpios05.lo: $(GLPKDIR)/src/glpios05.c
     678@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpios05.lo -MD -MP -MF "$(DEPDIR)/glpios05.Tpo" -c -o glpios05.lo `test -f '$(GLPKDIR)/src/glpios05.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios05.c; \
     679@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpios05.Tpo" "$(DEPDIR)/glpios05.Plo"; else rm -f "$(DEPDIR)/glpios05.Tpo"; exit 1; fi
     680@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpios05.c' object='glpios05.lo' libtool=yes @AMDEPBACKSLASH@
     681@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     682@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios05.lo `test -f '$(GLPKDIR)/src/glpios05.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios05.c
    674683
    675684glpipm.lo: $(GLPKDIR)/src/glpipm.c

  • ThirdParty/Glpk/trunk/get.Glpk

    r735 r788  
    22
    33set -e
    4 glpk_ver=4.23
     4glpk_ver=4.24
    55
    66wgetcmd=wget
    … …  
    4747echo " "
    4848echo "Done downloading the source code for GLPK."
     49echo "Applying patch file."
    4950echo " "
     51
     52patch -p0 < glpk.patch
    5053
    5154echo " "
Note: See TracChangeset for help on using the changeset viewer.