glpk-4.60-debundle-system-libs.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293
  1. Remove suitesparse (camd,colamd) and zlib bundles
  2. bicatali - apr 2014
  3. Updated for 4.57 by soap (Jan 2016)
  4. Updated for 4.60 by bicatali (Dec 2016)
  5. --- glpk-4.60/configure.ac
  6. +++ glpk-4.60/configure.ac
  7. @@ -59,6 +59,11 @@
  8. dnl Check for math library
  9. AC_CHECK_LIB([m], [exp])
  10. +AC_CHECK_LIB([amd], [amd_1])
  11. +AC_CHECK_LIB([colamd], [colamd])
  12. +AC_CHECK_HEADER([amd.h])
  13. +AC_CHECK_LIB([z], [gzopen])
  14. +
  15. dnl Check for <sys/time.h> header
  16. AC_CHECK_HEADER([sys/time.h],
  17. AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
  18. --- glpk-4.60/src/Makefile.am
  19. +++ glpk-4.60/src/Makefile.am
  20. @@ -6,18 +6,15 @@
  21. libglpk_la_CPPFLAGS = \
  22. -I$(srcdir) \
  23. --I$(srcdir)/amd \
  24. -I$(srcdir)/api \
  25. -I$(srcdir)/bflib \
  26. -I$(srcdir)/cglib \
  27. --I$(srcdir)/colamd \
  28. -I$(srcdir)/env \
  29. -I$(srcdir)/minisat \
  30. -I$(srcdir)/misc \
  31. -I$(srcdir)/mpl \
  32. -I$(srcdir)/proxy \
  33. --I$(srcdir)/simplex \
  34. --I$(srcdir)/zlib
  35. +-I$(srcdir)/simplex
  36. libglpk_la_LDFLAGS = \
  37. -version-info 41:0:1 \
  38. @@ -63,18 +60,6 @@
  39. glpssx02.c \
  40. lux.c \
  41. spv.c \
  42. -amd/amd_1.c \
  43. -amd/amd_2.c \
  44. -amd/amd_aat.c \
  45. -amd/amd_control.c \
  46. -amd/amd_defaults.c \
  47. -amd/amd_dump.c \
  48. -amd/amd_info.c \
  49. -amd/amd_order.c \
  50. -amd/amd_post_tree.c \
  51. -amd/amd_postorder.c \
  52. -amd/amd_preprocess.c \
  53. -amd/amd_valid.c \
  54. api/advbas.c \
  55. api/asnhall.c \
  56. api/asnlp.c \
  57. @@ -142,7 +127,6 @@
  58. cglib/gmicut.c \
  59. cglib/gmigen.c \
  60. cglib/mirgen.c \
  61. -colamd/colamd.c \
  62. env/alloc.c \
  63. env/dlsup.c \
  64. env/env.c \
  65. @@ -195,21 +179,6 @@
  66. simplex/spxprob.c \
  67. simplex/spychuzc.c \
  68. simplex/spychuzr.c \
  69. -simplex/spydual.c \
  70. -zlib/adler32.c \
  71. -zlib/compress.c \
  72. -zlib/crc32.c \
  73. -zlib/deflate.c \
  74. -zlib/gzclose.c \
  75. -zlib/gzlib.c \
  76. -zlib/gzread.c \
  77. -zlib/gzwrite.c \
  78. -zlib/inffast.c \
  79. -zlib/inflate.c \
  80. -zlib/inftrees.c \
  81. -zlib/trees.c \
  82. -zlib/uncompr.c \
  83. -zlib/zio.c \
  84. -zlib/zutil.c
  85. +simplex/spydual.c
  86. ## eof ##