pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/48467: math/glpk conflicts with open(2), write(2), etc.
The following reply was made to PR pkg/48467; it has been noted by GNATS.
From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: pkg/48467: math/glpk conflicts with open(2), write(2), etc.
Date: Sun, 22 Dec 2013 00:48:24 +0000
On Sun, Dec 22, 2013 at 12:30:00AM +0000, David Holland wrote:
> On Sat, Dec 21, 2013 at 10:05:00PM +0000, Leonardo Taccari wrote:
> > math/glpk does not build due various conflicts as reported by
> > recent pkgsrc bulk builds.
>
> It works fine for me, which seems odd...
>
> Anyhow, wouldn't it be better to get it to use pkgsrc zlib instead of
> its own copy?
following patch builds for me:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/glpk/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 31 Jul 2013 07:02:35 -0000 1.38
+++ Makefile 22 Dec 2013 00:47:26 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.38 2013/07/31 07:02:35 adam Exp $
DISTNAME= glpk-4.52.1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=glpk/}
@@ -10,10 +11,17 @@ COMMENT= Library for solving linear prog
LICENSE= gnu-gpl-v3
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake aclocal autoconf automake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gmp
TEST_TARGET= check
+post-extract:
+ rm -r ${WRKSRC}/src/zlib
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vi
+
.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/glpk/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 31 Jul 2013 07:02:35 -0000 1.31
+++ distinfo 22 Dec 2013 00:47:26 -0000
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.31 2013/07/31 07:0
SHA1 (glpk-4.52.1.tar.gz) = 63fd6788f95adb52789767b19e38cfb58dda331e
RMD160 (glpk-4.52.1.tar.gz) = 075727b0be569e96d3bc29d248334132a80f4e25
Size (glpk-4.52.1.tar.gz) = 2812957 bytes
+SHA1 (patch-src_Makefile.am) = 986c312e810304a2ab276ef9e1e6cd98bc6ac9a1
Index: patches/patch-src_Makefile.am
===================================================================
RCS file: patches/patch-src_Makefile.am
diff -N patches/patch-src_Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile.am 22 Dec 2013 00:47:26 -0000
@@ -0,0 +1,39 @@
+$NetBSD$
+
+Disable internal copy of zlib in favor of pkgsrc one.
+
+--- src/Makefile.am~ 2013-07-28 08:00:00.000000000 +0000
++++ src/Makefile.am
+@@ -20,6 +20,9 @@ libglpk_la_LDFLAGS = \
+ -version-info 36:1:0 \
+ -export-symbols-regex '^glp_*'
+
++libglpk_la_LIBADD = \
++-lz
++
+ libglpk_la_SOURCES = \
+ glpapi01.c \
+ glpapi02.c \
+@@ -144,21 +147,6 @@ misc/triang.c \
+ misc/wclique.c \
+ misc/wclique1.c \
+ proxy/proxy.c \
+-proxy/proxy1.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
++proxy/proxy1.c
+
+ ## eof ##
--
David A. Holland
dholland%netbsd.org@localhost
Home |
Main Index |
Thread Index |
Old Index