NetBSD Problem Report #47161

From diro@nixsyspaus.org  Tue Nov  6 12:22:07 2012
Return-Path: <diro@nixsyspaus.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	by www.NetBSD.org (Postfix) with ESMTP id 747E563CD6C
	for <gnats-bugs@gnats.netbsd.org>; Tue,  6 Nov 2012 12:22:07 +0000 (UTC)
Message-Id: <20121106122204.4E7F32041E4@asche.nixsyspaus.org>
Date: Tue,  6 Nov 2012 12:22:04 +0000 (UTC)
From: diro@nixsyspaus.org
Reply-To: diro@nixsyspaus.org
To: gnats-bugs@gnats.netbsd.org
Subject: Could we add zlib.pc.in from the zlib distro to pkgsrc?
X-Send-Pr-Version: 3.95

>Number:         47161
>Category:       pkg
>Synopsis:       Could we add zlib.pc.in from the zlib distro to pkgsrc?
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Nov 06 12:25:00 +0000 2012
>Closed-Date:    Thu Feb 06 09:36:37 +0000 2014
>Last-Modified:  Thu Feb 06 09:36:37 +0000 2014
>Originator:     diro@nixsyspaus.org
>Release:        NetBSD 6.0
>Organization:
>Environment:
System: NetBSD nguest 6.0 NetBSD 6.0 (GENERIC) amd64
Architecture: amd64
Machine: amd64
>Description:
	There is no zlib.pc distributed with the pkgsrc version of zlib.
>How-To-Repeat:
	Build a package that's looking for zlib.pc and get tired of the warning
messages.
>Fix:
	Add it and the corresponding PKG_CONFIG_OVERRIDE line to
devel/zlib/Makefile;
	Add lib/pkgconfig/zlib.pc to devel/zlib/PLIST

>Release-Note:

>Audit-Trail:
From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/47161
Date: Wed, 7 Nov 2012 07:26:24 -0600 (CST)

 diro:

 Can you ask the upstream to include it in their source?

 (For some reason their changes file mentions it but I don't see it.)

 I do see other package systems do provide their own for it.

From: diro@nixsyspaus.org
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/47161
Date: Wed, 7 Nov 2012 09:00:32 -0500

 >  Can you ask the upstream to include it in their source?

 Upstream in this case are not particularly cooperative. They really don't care
 if their package supports NetBSD. Also, they don't do releases very often. It
 would be a while before we saw the change if it were even realised.

 >  (For some reason their changes file mentions it but I don't see it.)

 It's in here: http://zlib.net/zlib-1.2.7.tar.gz (zlib.pc.in)

 >  I do see other package systems do provide their own for it.

 Yeah, i figured since we're providing our own zlib files anyway, it wouldn't
 be too much to include the pkg-config file for it as well.

State-Changed-From-To: open->feedback
State-Changed-By: reed@NetBSD.org
State-Changed-When: Wed, 07 Nov 2012 15:08:51 +0000
State-Changed-Why:
sent a patch to test


From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/47161
Date: Wed, 7 Nov 2012 09:07:38 -0600 (CST)

 On Wed, 7 Nov 2012, diro@nixsyspaus.org wrote:

 >  >  (For some reason their changes file mentions it but I don't see it.)
 >  
 >  It's in here: http://zlib.net/zlib-1.2.7.tar.gz (zlib.pc.in)

 Thanks for making me look again :)

 I forgot we bundled the sources so I didn't see it when I did a "make 
 extract".

 Please test the following after adding the file to files:

 ? devel/zlib/files/zlib.pc.in
 Index: devel/zlib/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/zlib/Makefile,v
 retrieving revision 1.45
 diff -u -r1.45 Makefile
 --- devel/zlib/Makefile	31 Oct 2012 11:19:55 -0000	1.45
 +++ devel/zlib/Makefile	7 Nov 2012 15:06:41 -0000
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.45 2012/10/31 11:19:55 asau Exp $

  DISTNAME=	zlib-1.2.7
 +PKGREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
  		http://www.gzip.org/zlib/
 @@ -14,10 +15,21 @@
  PKG_INSTALLATION_TYPES=	overwrite pkgviews

  USE_LIBTOOL=		yes
 -
 +PKGCONFIG_OVERRIDE+=	zlib.pc.in
  CFLAGS+=		${CPPFLAGS}

 -INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
 +INSTALLATION_DIRS=	include lib lib/pkgconfig ${PKGMANDIR}/man3
 +
 +SUBST_CLASSES+=	pc
 +SUBST_MESSAGE.pc=	pkg-config file substitutions
 +SUBST_STAGE.pc=		pre-configure
 +SUBST_FILES.pc=		zlib.pc.in
 +SUBST_SED.pc=		-e "s|@prefix@|${PREFIX}|g"
 +SUBST_SED.pc+=		-e "s|@exec_prefix@|${PREFIX}|g"
 +SUBST_SED.pc+=		-e 's|@libdir@|$${exec_prefix}/lib|g'
 +SUBST_SED.pc+=		-e 's|@sharedlibdir@|$${exec_prefix}/lib|g'
 +SUBST_SED.pc+=		-e 's|@includedir@|$${prefix}/include|g'
 +SUBST_SED.pc+=		-e "s|@VERSION@|${PKGVERSION_NOREV}|g"

  do-extract:
  	${CP} -r ${FILESDIR} ${WRKSRC}
 @@ -27,5 +39,7 @@
  	${INSTALL_MAN} ${WRKSRC}/zlib.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
  	${INSTALL_DATA} ${WRKSRC}/zconf.h ${DESTDIR}${PREFIX}/include
  	${INSTALL_DATA} ${WRKSRC}/zlib.h ${DESTDIR}${PREFIX}/include
 +	${INSTALL_DATA} ${WRKSRC}/zlib.pc.in \
 +		${DESTDIR}${PREFIX}/lib/pkgconfig/zlib.pc

  .include "../../mk/bsd.pkg.mk"
 Index: devel/zlib/PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/zlib/PLIST,v
 retrieving revision 1.3
 diff -u -r1.3 PLIST
 --- devel/zlib/PLIST	22 Sep 2004 08:09:30 -0000	1.3
 +++ devel/zlib/PLIST	7 Nov 2012 15:06:41 -0000
 @@ -2,4 +2,5 @@
  include/zconf.h
  include/zlib.h
  lib/libz.la
 +lib/pkgconfig/zlib.pc
  man/man3/zlib.3

From: diro@nixsyspaus.org
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/47161
Date: Wed, 7 Nov 2012 11:00:13 -0500

 > [...]  
 >  Please test the following after adding the file to files:
 > [...]
 >  +INSTALLATION_DIRS=	include lib lib/pkgconfig ${PKGMANDIR}/man3

 lib is extraneous as lib/pkgconfig takes care of that.

 Everything looks good through the build. I didn't do an update, because that
 would rebuild my entire system, which i can't do right now. I symlinked zlib.pc
 after the configure stage of another package, the build of that package picked
 it up, and the errors went away.

 Mission accomplished. Thanks very much.

State-Changed-From-To: feedback->open
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Mon, 25 Feb 2013 18:46:37 +0000
State-Changed-Why:
feedback received; but as far as I can tell the patch has not yet been
committed.


State-Changed-From-To: open->closed
State-Changed-By: obache@NetBSD.org
State-Changed-When: Thu, 06 Feb 2014 09:36:37 +0000
State-Changed-Why:
zlib.pc is in pkgsrc now.


>Unformatted:

Home	PR Database Search