Date: Sun, 11 Jan 2015 23:27:44 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r276962 - head/lib/liblzma Message-ID: <20150111212744.GE42409@kib.kiev.ua> In-Reply-To: <201501110925.t0B9P2Sg005368@svn.freebsd.org> References: <201501110925.t0B9P2Sg005368@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jan 11, 2015 at 09:25:02AM +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Sun Jan 11 09:25:01 2015 > New Revision: 276962 > URL: https://svnweb.freebsd.org/changeset/base/276962 > > Log: > Do not regenerate and install liblzma.pc when only build libraries > aka do not regenerate while generating 32bits libs > > Reported by: antoine > > Modified: > head/lib/liblzma/Makefile > > Modified: head/lib/liblzma/Makefile > ============================================================================== > --- head/lib/liblzma/Makefile Sun Jan 11 08:40:01 2015 (r276961) > +++ head/lib/liblzma/Makefile Sun Jan 11 09:25:01 2015 (r276962) > @@ -148,12 +148,13 @@ CFLAGS+= -DSYMBOL_VERSIONING > > CLEANFILES+= liblzma.pc > > +.if !defined(LIBRARIES_ONLY) > all: liblzma.pc I think that much better define to differentiate on would be COMPAT_32BIT. That said, head and stable/10 should be almost clean now for allowing ports and third-party software to work with cc -m32. I think that this commit makes it in other direction. Could the .pc files for base system provided by some port ? > liblzma.pc: liblzma.pc.in > @sed -e 's,@prefix@,/usr,g ; \ > s,@exec_prefix@,/usr,g ; \ > - s,@libdir@,${LIBDIR},g ; \ > - s,@includedir@,${INCLUDEDIR},g ; \ > + s,@libdir@,/usr/lib,g ; \ > + s,@includedir@,/usr/include,g ; \ > s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \ > s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \ > s,@PTHREAD_CFLAGS@,,g ; \ > @@ -162,5 +163,6 @@ liblzma.pc: liblzma.pc.in > beforeinstall: > @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ > liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig > +.endif > > .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150111212744.GE42409>