Skip to content

Instantly share code, notes, and snippets.

@bfallik
Created March 30, 2017 15:51
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bfallik/4fb2f7e988f9940eb30891c087a70fb5 to your computer and use it in GitHub Desktop.
Save bfallik/4fb2f7e988f9940eb30891c087a70fb5 to your computer and use it in GitHub Desktop.
update patch that unbundles zlib from glpk
diff -urN glpk-4.58.orig/doc/glpk11.tex glpk-4.58/doc/glpk11.tex
--- glpk-4.58.orig/doc/glpk11.tex 2016-02-17 23:00:00.000000000 -0800
+++ glpk-4.58/doc/glpk11.tex 2016-02-18 09:00:39.557369206 -0800
@@ -158,50 +158,4 @@
\noindent
\url{http://www.cs.chalmers.se/Cs/Research/FormalMethods/MiniSat}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\section{zlib}
-
-\noindent
-zlib version 1.2.5, Copyright {\copyright} 1995--2010 Jean-loup Gailly
-and Mark Adler.
-
-\para{Description}
-
-zlib is a general purpose data compression library. All the code is
-thread safe. The data format used by the zlib library is described by
-RFCs (Request for Comments) 1950 to 1952 in the files
-\verb|rfc1950.txt| (zlib format), \verb|rfc1951.txt| (deflate format)
-and \verb|rfc1952.txt| (gzip format).
-
-\para{License}
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would
- be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
- be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
- distribution.
-
-\hfill Jean-loup Gailly
-
-\hfill Mark Adler
-
-\para{Availability}
-
-\noindent
-\url{http://www.zlib.net/}
-
%* eof *%
--- glpk-4.61.orig/src/Makefile.am 2017-01-22 07:00:00.000000000 +0000
+++ glpk-4.61/src/Makefile.am 2017-03-30 15:42:31.590400473 +0000
@@ -16,14 +16,15 @@
-I$(srcdir)/misc \
-I$(srcdir)/mpl \
-I$(srcdir)/proxy \
--I$(srcdir)/simplex \
--I$(srcdir)/zlib
+-I$(srcdir)/simplex
libglpk_la_LDFLAGS = \
-version-info 42:0:2 \
-export-symbols-regex '^glp_*' \
${NOUNDEFINED}
+libglpk_la_LIBADD = -lz
+
libglpk_la_SOURCES = \
bfd.c \
bfx.c \
@@ -195,21 +196,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 ##
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment