File:
[cvs.NetBSD.org] /
pkgsrc /
math /
glpk /
patches /
patch-src_Makefile.in
Revision
1.8:
download - view:
text,
annotated -
select for diffs
Sun Nov 28 20:08:24 2021 UTC (3 years, 1 month ago) by
adam
Branches:
MAIN
CVS tags:
pkgsrc-2024Q4-base,
pkgsrc-2024Q4,
pkgsrc-2024Q3-base,
pkgsrc-2024Q3,
pkgsrc-2024Q2-base,
pkgsrc-2024Q2,
pkgsrc-2024Q1-base,
pkgsrc-2024Q1,
pkgsrc-2023Q4-base,
pkgsrc-2023Q4,
pkgsrc-2023Q3-base,
pkgsrc-2023Q3,
pkgsrc-2023Q2-base,
pkgsrc-2023Q2,
pkgsrc-2023Q1-base,
pkgsrc-2023Q1,
pkgsrc-2022Q4-base,
pkgsrc-2022Q4,
pkgsrc-2022Q3-base,
pkgsrc-2022Q3,
pkgsrc-2022Q2-base,
pkgsrc-2022Q2,
pkgsrc-2022Q1-base,
pkgsrc-2022Q1,
pkgsrc-2021Q4-base,
pkgsrc-2021Q4,
HEAD
glpk: updated to 5.0
GLPK 5.0
The copyright was transferred to the Free Software Foundation.
To fix some licensing problems the routines in the following
files were disabled by replacing with dummy ones that print an
error message:
src/api/gridgen.c
src/api/netgen.c
src/api/rmfgen.c
src/misc/qmd.c
src/misc/relax4.c
Note that this change does not affect the main faunctionality
of the package.
Some minor bugs were fixed.
$NetBSD: patch-src_Makefile.in,v 1.8 2021/11/28 20:08:24 adam Exp $
Use external zlib.
--- src/Makefile.in.orig 2020-12-16 09:00:00.000000000 +0000
+++ src/Makefile.in
@@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libglpk_la_LIBADD =
+libglpk_la_LIBADD = -lz
am_libglpk_la_OBJECTS = libglpk_la-amd_1.lo libglpk_la-amd_2.lo \
libglpk_la-amd_aat.lo libglpk_la-amd_control.lo \
libglpk_la-amd_defaults.lo libglpk_la-amd_dump.lo \
@@ -161,14 +161,7 @@ am_libglpk_la_OBJECTS = libglpk_la-amd_1
libglpk_la-spxchuzc.lo libglpk_la-spxchuzr.lo \
libglpk_la-spxlp.lo libglpk_la-spxnt.lo libglpk_la-spxprim.lo \
libglpk_la-spxprob.lo libglpk_la-spychuzc.lo \
- libglpk_la-spychuzr.lo libglpk_la-spydual.lo \
- libglpk_la-adler32.lo libglpk_la-compress.lo \
- libglpk_la-crc32.lo libglpk_la-deflate.lo \
- libglpk_la-gzclose.lo libglpk_la-gzlib.lo libglpk_la-gzread.lo \
- libglpk_la-gzwrite.lo libglpk_la-inffast.lo \
- libglpk_la-inflate.lo libglpk_la-inftrees.lo \
- libglpk_la-trees.lo libglpk_la-uncompr.lo libglpk_la-zio.lo \
- libglpk_la-zutil.lo
+ libglpk_la-spychuzr.lo libglpk_la-spydual.lo
libglpk_la_OBJECTS = $(am_libglpk_la_OBJECTS)
libglpk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -327,8 +320,7 @@ libglpk_la_CPPFLAGS = \
-I$(srcdir)/mpl \
-I$(srcdir)/npp \
-I$(srcdir)/proxy \
--I$(srcdir)/simplex \
--I$(srcdir)/zlib
+-I$(srcdir)/simplex
libglpk_la_LDFLAGS = \
-version-info 43:1:3 \
@@ -511,22 +503,7 @@ simplex/spxprim.c \
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
all: all-am
CVSweb <webmaster@jp.NetBSD.org>