From owner-svn-src-head@FreeBSD.ORG Sun Jan 11 21:27:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AD8578D; Sun, 11 Jan 2015 21:27:51 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73B732DF; Sun, 11 Jan 2015 21:27:50 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t0BLRiqK029766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 11 Jan 2015 23:27:44 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t0BLRiqK029766 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t0BLRiZY029765; Sun, 11 Jan 2015 23:27:44 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 11 Jan 2015 23:27:44 +0200 From: Konstantin Belousov To: Baptiste Daroussin Subject: Re: svn commit: r276962 - head/lib/liblzma Message-ID: <20150111212744.GE42409@kib.kiev.ua> References: <201501110925.t0B9P2Sg005368@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201501110925.t0B9P2Sg005368@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2015 21:27:51 -0000 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